diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | glpi-fedora-autoloader.php | 5 | ||||
| -rw-r--r-- | glpi.spec | 51 |
3 files changed, 31 insertions, 28 deletions
diff --git a/composer.json b/composer.json index 91cd449..3a19aa9 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,6 @@ "paragonie/random_compat": "^2.0", "monolog/monolog": "^1.23", "sebastian/diff": "^1.4 || ^2.0 || ^3.0", - "zendframework/zend-console": "^2.7", "elvanto/litemoji": "^1.4", "symfony/console": "^3.4", "leafo/scssphp": "^0.7.7" @@ -45,7 +44,7 @@ "patchwork/jsqueeze": "^2.0", "atoum/atoum": "^3.3", "atoum/telemetry-extension": "^1.0", - "sensiolabs/security-checker": "^4.1", + "sensiolabs/security-checker": "^5.0", "fzaninotto/Faker": "^1.7", "jakub-onderka/php-parallel-lint": "^1.0", "mikey179/vfsStream": "^1.6" diff --git a/glpi-fedora-autoloader.php b/glpi-fedora-autoloader.php index d18c5cc..ebb3394 100644 --- a/glpi-fedora-autoloader.php +++ b/glpi-fedora-autoloader.php @@ -30,11 +30,6 @@ require_once "$vendor/Fedora/Autoloader/autoload.php"; "$vendor/Zend/Serializer/autoload.php", "$vendor/Zend/autoload.php", ], - // "zendframework/zend-console": "^2.7" - [ - "$vendor/Zend/Console/autoload.php", - "$vendor/Zend/autoload.php", - ], // "michelf/php-markdown": "^1.6", "$vendor/Michelf/markdown-autoload.php", // "true/punycode": "^2.1", @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 1783b781b221fe4212806c910dec3898c079c59f +%global gh_commit 8e621f6ce937eea6b7f1412a65c6dd74af188706 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -52,7 +52,7 @@ %endif Name: %{gh_project} -%global upstream_version 9.4.0 +%global upstream_version 9.4.1 #global upstream_prever RC2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} @@ -100,7 +100,6 @@ BuildRequires: (php-composer(sebastian/diff) >= 1.4 with php BuildRequires: (php-autoloader(zendframework/zend-cache) >= 2.8 with php-autoloader(zendframework/zend-cache) < 3) BuildRequires: (php-autoloader(zendframework/zend-i18n) >= 2.8 with php-autoloader(zendframework/zend-i18n) < 3) BuildRequires: (php-autoloader(zendframework/zend-serializer) >= 2.8 with php-autoloader(zendframework/zend-serializer) < 3) -BuildRequires: (php-autoloader(zendframework/zend-console) >= 2.7 with php-autoloader(zendframework/zend-console) < 3) BuildRequires: (php-composer(michelf/php-markdown) >= 1.6 with php-composer(michelf/php-markdown) < 2) BuildRequires: (php-composer(true/punycode) >= 2.1 with php-composer(true/punycode) < 3) BuildRequires: (php-composer(paragonie/random_compat) >= 2.0 with php-composer(paragonie/random_compat) < 3) @@ -112,7 +111,7 @@ BuildRequires: (php-composer(leafo/scssphp) >= 0.7.7 with php 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) BuildRequires: (php-composer(mikey179/vfsStream) >= 1.6 with php-composer(mikey179/vfsStream) < 2) -# remirepo:42 +# remirepo:40 %else BuildRequires: php-composer(iamcal/lib_autolink) < 2 BuildRequires: php-composer(iamcal/lib_autolink) >= 1.7 @@ -132,8 +131,6 @@ BuildRequires: php-composer(zendframework/zend-i18n) < 3 BuildRequires: php-composer(zendframework/zend-i18n) >= 2.8 BuildRequires: php-composer(zendframework/zend-serializer) < 3 BuildRequires: php-composer(zendframework/zend-serializer) >= 2.8 -BuildRequires: php-composer(zendframework/zend-console) < 3 -BuildRequires: php-composer(zendframework/zend-console) >= 2.7 BuildRequires: php-composer(michelf/php-markdown) < 2 BuildRequires: php-composer(michelf/php-markdown) >= 1.6 BuildRequires: php-composer(true/punycode) < 3 @@ -192,16 +189,13 @@ Requires: php-date Requires: php-fileinfo Requires: php-filter Requires: php-gd -Requires: php-imap Requires: php-json -Requires: php-ldap Requires: php-mbstring Requires: php-mysqli Requires: php-pcre Requires: php-session Requires: php-spl Requires: php-xml -Requires: php-xmlrpc Requires: php-zlib Requires: php-htmLawed # remirepo:1 @@ -215,7 +209,6 @@ Requires: (php-composer(sebastian/diff) >= 1.4 with php Requires: (php-autoloader(zendframework/zend-cache) >= 2.8 with php-autoloader(zendframework/zend-cache) < 3) Requires: (php-autoloader(zendframework/zend-i18n) >= 2.8 with php-autoloader(zendframework/zend-i18n) < 3) Requires: (php-autoloader(zendframework/zend-serializer) >= 2.8 with php-autoloader(zendframework/zend-serializer) < 3) -Requires: (php-autoloader(zendframework/zend-console) >= 2.7 with php-autoloader(zendframework/zend-console) < 3) Requires: (php-composer(michelf/php-markdown) >= 1.6 with php-composer(michelf/php-markdown) < 2) Requires: (php-composer(true/punycode) >= 2.1 with php-composer(true/punycode) < 3) Requires: (php-composer(paragonie/random_compat) >= 2.0 with php-composer(paragonie/random_compat) < 3) @@ -223,7 +216,7 @@ Requires: (php-composer(monolog/monolog) >= 1.23 with php Requires: (php-composer(elvanto/litemoji) >= 1.4 with php-composer(elvanto/litemoji) < 2) Requires: (php-composer(symfony/console) >= 3.4 with php-composer(symfony/console) < 4) Requires: (php-composer(leafo/scssphp) >= 0.7.7 with php-composer(leafo/scssphp) < 1) -# remirepo:35 +# remirepo:33 %else Requires: php-composer(iamcal/lib_autolink) < 2 Requires: php-composer(iamcal/lib_autolink) >= 1.7 @@ -242,8 +235,6 @@ Requires: php-composer(zendframework/zend-i18n) < 3 Requires: php-composer(zendframework/zend-i18n) >= 2.8 Requires: php-composer(zendframework/zend-serializer) < 3 Requires: php-composer(zendframework/zend-serializer) >= 2.8 -Requires: php-composer(zendframework/zend-console) < 3 -Requires: php-composer(zendframework/zend-console) >= 2.7 Requires: php-composer(zendframework/zend-loader) Requires: php-composer(michelf/php-markdown) < 2 Requires: php-composer(michelf/php-markdown) >= 1.6 @@ -288,10 +279,22 @@ Requires(post): /usr/sbin/semanage Requires(postun): /usr/sbin/semanage %endif Requires: crontabs -%if 0%{?fedora} || 0%{?rhel} >= 8 -Recommends: php-pecl-apcu +# remirepo:1 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 +# Optional +Recommends: php-exif +Recommends: php-imap +Recommends: php-ldap +Recommends: php-xmlrpc +Recommends: php-apcu Recommends: php-opcache Recommends: php-selinux +# remirepo:6 +%else +Requires: php-exif +Requires: php-imap +Requires: php-ldap +Requires: php-xmlrpc %endif # see https://github.com/glpi-project/glpi/issues/4837 @@ -473,6 +476,7 @@ rm -rf data mkdir data : Create the Database %{_bindir}/mysql_install_db \ + --force \ --log-error=$PWD/mysql.log \ --datadir=$PWD/data @@ -500,12 +504,13 @@ cp %{SOURCE12} inc/downstream.php : Run upstream test suite 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 -atoum --debug --use-dot-report --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 \ - -d tests/functionnal || RET=1 -atoum --debug --use-dot-report --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 \ - -d tests/web || RET=1 +: Ignore test which raise memory issue +rm tests/functionnal/Search.php + +ATOUM="%{_bindir}/atoum --debug --use-dot-report --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1" +$ATOUM -d tests/units || RET=1 +$ATOUM -d tests/functionnal || RET=1 +$ATOUM -d tests/web || RET=1 : Cleanup if [ -s $MYSQL_PID_FILE ]; then @@ -565,6 +570,7 @@ fi %files -f %{name}.lang +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE.* %doc *.txt *.md @@ -607,6 +613,9 @@ fi %changelog +* Thu Mar 14 2019 Remi Collet <remi@remirepo.net> - 9.4.1-1 +- update to 9.4.1 + * Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 9.4.0-1 - update to 9.4.0 |