summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-12-21 17:34:14 +0100
committerRemi Collet <remi@remirepo.net>2018-12-21 17:34:14 +0100
commit96f900ba43385fd1eb6c0b00039a3be125c6bf28 (patch)
tree703c5e093ec02021a1651efdc3d028c609db72cc
parent87c0348084cb603dd1e03474502c3ab6366e273f (diff)
9.4.0 [ WIP ]
- update to 9.4.0 RC1 - add dependency on symfony/console 3.4 - add dependency on leafo/scssphp 0.7 - add build dependency on mikey179/vfsStream 1.6 - drop dependency on fontawesome-fonts
-rw-r--r--composer.json7
-rw-r--r--glpi-bin.patch13
-rw-r--r--glpi-fedora-autoloader.php6
-rw-r--r--glpi.spec54
4 files changed, 59 insertions, 21 deletions
diff --git a/composer.json b/composer.json
index d1c3ee8..91cd449 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,9 @@
"monolog/monolog": "^1.23",
"sebastian/diff": "^1.4 || ^2.0 || ^3.0",
"zendframework/zend-console": "^2.7",
- "elvanto/litemoji": "^1.4"
+ "elvanto/litemoji": "^1.4",
+ "symfony/console": "^3.4",
+ "leafo/scssphp": "^0.7.7"
},
"require-dev": {
"guzzlehttp/guzzle": "~6",
@@ -45,7 +47,8 @@
"atoum/telemetry-extension": "^1.0",
"sensiolabs/security-checker": "^4.1",
"fzaninotto/Faker": "^1.7",
- "jakub-onderka/php-parallel-lint": "^1.0"
+ "jakub-onderka/php-parallel-lint": "^1.0",
+ "mikey179/vfsStream": "^1.6"
},
"suggest": {
"ext-ldap": "Used ot provide LDAP authentication and synchronization",
diff --git a/glpi-bin.patch b/glpi-bin.patch
new file mode 100644
index 0000000..b9f8d56
--- /dev/null
+++ b/glpi-bin.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/console b/bin/console
+index 890b18812..0152dcc4d 100755
+--- a/bin/console
++++ b/bin/console
+@@ -59,7 +59,7 @@ if (array_key_exists('config-dir', $options)) {
+
+
+ // Init GLPI
+-define('GLPI_ROOT', dirname(__DIR__));
++define('GLPI_ROOT', '/usr/share/glpi');
+
+ include_once(GLPI_ROOT . '/inc/based_config.php');
+ include_once(GLPI_ROOT . '/inc/db.function.php');
diff --git a/glpi-fedora-autoloader.php b/glpi-fedora-autoloader.php
index cc10ef1..d18c5cc 100644
--- a/glpi-fedora-autoloader.php
+++ b/glpi-fedora-autoloader.php
@@ -50,7 +50,11 @@ require_once "$vendor/Fedora/Autoloader/autoload.php";
"$vendor/SebastianBergmann/Diff3/autoload.php",
"$vendor/SebastianBergmann/Diff2/autoload.php",
"$vendor/SebastianBergmann/Diff/autoload.php",
- ]
+ ],
+// "symfony/console": "^3.4",
+ "$vendor/Symfony3/Component/Console/autoload.php",
+// "leafo/scssphp": "^0.7.7"
+ "$vendor/Leafo/ScssPhp/autoload.php",
]);
\Fedora\Autoloader\Dependencies::optional([
// "jasig/phpcas": "~1.3.0",
diff --git a/glpi.spec b/glpi.spec
index 618bfd1..daa56ed 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
-%global gh_commit 0cbfde346c5afd6b749a2dd893fd4c0fa3c49c74
+%global gh_commit a91cd4fae005b30123cf883bddf837dfd26a959b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20160923
%global gh_owner glpi-project
@@ -52,9 +52,8 @@
%endif
Name: %{gh_project}
-%global upstream_version 9.3.3
-#global upstream_prever RC2
-# use 9.3.0~RC2 < 9.3 (for plugin compatibility check)
+%global upstream_version 9.4.0
+%global upstream_prever RC1
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 1%{?dist}
Summary: Free IT asset management software
@@ -76,6 +75,9 @@ Source6: %{name}-minify.php
# Override PHP configuration for php-fpm
Source7: %{name}-user.ini
+# allow to install in /usr/bin
+Patch0: %{name}-bin.patch
+
BuildArch: noarch
BuildRequires: gettext
BuildRequires: php-cli
@@ -104,10 +106,13 @@ BuildRequires: (php-composer(true/punycode) >= 2.1 with php
BuildRequires: (php-composer(paragonie/random_compat) >= 2.0 with php-composer(paragonie/random_compat) < 3)
BuildRequires: (php-composer(monolog/monolog) >= 1.23 with php-composer(monolog/monolog) < 2)
BuildRequires: (php-composer(elvanto/litemoji) >= 1.4 with php-composer(elvanto/litemoji) < 2)
+BuildRequires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 4)
+BuildRequires: (php-composer(leafo/scssphp) >= 0.7 with php-composer(leafo/scssphp) < 1)
# requires-dev
BuildRequires: (php-composer(guzzlehttp/guzzle) >= 6 with php-composer(guzzlehttp/guzzle) < 7)
BuildRequires: (php-composer(atoum/atoum) >= 3.3 with php-composer(atoum/atoum) < 4)
-# remirepo:37
+BuildRequires: (php-composer(mikey179/vfsStream) >= 1.6 with php-composer(mikey179/vfsStream) < 2)
+# remirepo:42
%else
BuildRequires: php-composer(iamcal/lib_autolink) < 2
BuildRequires: php-composer(iamcal/lib_autolink) >= 1.7
@@ -139,11 +144,16 @@ BuildRequires: php-composer(monolog/monolog) < 2
BuildRequires: php-composer(monolog/monolog) >= 1.23
BuildRequires: php-composer(elvanto/litemoji) < 2
BuildRequires: php-composer(elvanto/litemoji) >= 1.4
+BuildRequires: php-composer(leafo/scssphp) < 1
+BuildRequires: php-composer(leafo/scssphp) >= 0.7
+BuildRequires: php-symfon3-console >= 3.4
# requires-dev
BuildRequires: php-composer(guzzlehttp/guzzle) < 7
BuildRequires: php-composer(guzzlehttp/guzzle) >= 6
BuildRequires: php-composer(atoum/atoum) < 4
BuildRequires: php-composer(atoum/atoum) >= 3.3
+BuildRequires: php-composer(mikey179/vfsStream) < 2
+BuildRequires: php-composer(mikey179/vfsStream) >= 1.6
%endif
%endif
# To minimize assets
@@ -211,7 +221,9 @@ Requires: (php-composer(true/punycode) >= 2.1 with php
Requires: (php-composer(paragonie/random_compat) >= 2.0 with php-composer(paragonie/random_compat) < 3)
Requires: (php-composer(monolog/monolog) >= 1.23 with php-composer(monolog/monolog) < 2)
Requires: (php-composer(elvanto/litemoji) >= 1.4 with php-composer(elvanto/litemoji) < 2)
-# remirepo:32
+Requires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 4)
+Requires: (php-composer(leafo/scssphp) >= 0.7 with php-composer(leafo/scssphp) < 1)
+# remirepo:35
%else
Requires: php-composer(iamcal/lib_autolink) < 2
Requires: php-composer(iamcal/lib_autolink) >= 1.7
@@ -243,13 +255,11 @@ Requires: php-composer(monolog/monolog) < 2
Requires: php-composer(monolog/monolog) >= 1.23
Requires: php-composer(elvanto/litemoji) < 2
Requires: php-composer(elvanto/litemoji) >= 1.4
+Requires: php-symfon3-console >= 3.4
+Requires: php-composer(leafo/scssphp) < 1
+Requires: php-composer(leafo/scssphp) >= 0.7
%endif
Requires: gnu-free-sans-fonts
-%if 0%{?fedora} || 0%{?rhel} >= 8
-Requires: fontawesome-fonts >= 4.7.0
-%else
-Provides: bundled(fontawesome-fonts) = 4.7.0
-%endif
Provides: bundled(js-chartist-js) = 0.10.1
Provides: bundled(js-chartist-plugin-legend) = 0.6.0
Provides: bundled(js-chartist-plugin-tooltip) = 0.0.17
@@ -308,6 +318,7 @@ techniciens grâce à une maintenance plus cohérente.
%prep
%setup -q -n %{name}-%{gh_commit}
+%patch0 -p1 -b .rpm
grep %{upstream_version} inc/define.php
@@ -319,12 +330,6 @@ find lib -name \*.swf -exec rm {} \; -print
# Use system lib
rm -r lib/htmlawed
rm lib/FreeSans.ttf
-%if 0%{?fedora} || 0%{?rhel} >= 8
-rm lib/font-awesome-4.7.0/fonts/FontAwesome.otf
-rm lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
-ln -s /usr/share/fonts/fontawesome/FontAwesome.otf lib/font-awesome-4.7.0/fonts/FontAwesome.otf
-ln -s /usr/share/fonts/fontawesome/fontawesome-webfont.ttf lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
-%endif
: bundled JS libraries
ls lib
@@ -411,6 +416,9 @@ sed -e '/su /d' -i %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
# ====== Cron =====
install -Dpm 0644 cron %{buildroot}%{_sysconfdir}/cron.d/%{name}
+# ====== Command =====
+install -Dpm 0755 bin/console %{buildroot}%{_bindir}/%{name}-console
+
# cleanup
find %{buildroot} -name remove.txt -exec rm -f {} \; -print
@@ -442,6 +450,7 @@ cat << 'EOF' | tee -a vendor/autoload.php
\Fedora\Autoloader\Dependencies::required([
// "guzzlehttp/guzzle": "~6"
"$vendor/GuzzleHttp6/autoload.php",
+ "$vendor/org/bovigo/vfs/autoload.php",
]);
EOF
@@ -488,7 +497,7 @@ done
cp %{SOURCE12} inc/downstream.php
: Run upstream test suite
-php scripts/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_GB || RET=1
+bin/console.rpm glpi:database:install --config-dir=./tests --no-interaction --db-host=127.0.0.1:3308 --db-name=glpitest --db-user=root --force || RET=1
atoum --debug --use-dot-report --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 \
-d tests/units || RET=1
@@ -573,6 +582,8 @@ fi
%dir %_localstatedir/lib/%{name}
%attr(2770,root,apache) %{_localstatedir}/lib/%{name}/files
+%{_bindir}/%{name}-console
+
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.php
%{_datadir}/%{name}/apirest.md
@@ -595,6 +606,13 @@ fi
%changelog
+* Fri Dec 21 2018 Remi Collet <remi@remirepo.net> - 9.4.0~RC1-1
+- update to 9.4.0 RC1
+- add dependency on symfony/console 3.4
+- add dependency on leafo/scssphp 0.7
+- add build dependency on mikey179/vfsStream 1.6
+- drop dependency on fontawesome-fonts
+
* Tue Nov 27 2018 Remi Collet <remi@remirepo.net> - 9.3.3-1
- update to 9.3.3