diff --git a/glpi.spec b/glpi.spec index 5599569..01d574b 100644 --- a/glpi.spec +++ b/glpi.spec @@ -34,7 +34,7 @@ Name: %{gh_project} Version: 9.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -56,8 +56,8 @@ Source7: %{name}-user.ini BuildArch: noarch BuildRequires: gettext -%if %{with_tests} BuildRequires: php-cli +%if %{with_tests} BuildRequires: mariadb-server # Missing in mariadb BuildRequires: hostname @@ -65,42 +65,26 @@ BuildRequires: php-mysqli BuildRequires: php-xmlrpc # PHP libs BuildRequires: php-htmLawed -BuildRequires: php-composer(jasig/phpcas) < 2 -BuildRequires: php-composer(jasig/phpcas) >= 1.3 -BuildRequires: php-composer(iamcal/lib_autolink) < 2 -BuildRequires: php-composer(iamcal/lib_autolink) >= 1.7 -BuildRequires: php-composer(phpmailer/phpmailer) < 6 -BuildRequires: php-composer(phpmailer/phpmailer) >= 5.2 -BuildRequires: php-composer(sabre/vobject) < 5 -BuildRequires: php-composer(sabre/vobject) >= 4.1 -BuildRequires: php-composer(simplepie/simplepie) < 2 -BuildRequires: php-composer(tecnickcom/tcpdf) < 7 -BuildRequires: php-composer(tecnickcom/tcpdf) >= 6.2.16 -# Because 3 versions exists TODO: use range dependency -BuildRequires: php-phpunit-diff >= 1.4 -BuildRequires: php-autoloader(zendframework/zend-cache) < 3 -BuildRequires: php-autoloader(zendframework/zend-cache) >= 2.7 -BuildRequires: php-autoloader(zendframework/zend-i18n) < 3 -BuildRequires: php-autoloader(zendframework/zend-i18n) >= 2.7 -BuildRequires: php-autoloader(zendframework/zend-serializer) < 3 -BuildRequires: php-autoloader(zendframework/zend-serializer) >= 2.7 -BuildRequires: php-composer(michelf/php-markdown) < 2 -BuildRequires: php-composer(michelf/php-markdown) >= 1.6 -BuildRequires: php-composer(true/punycode) < 3 -BuildRequires: php-composer(true/punycode) >= 2.1 -BuildRequires: php-composer(paragonie/random_compat) < 3 -BuildRequires: php-composer(paragonie/random_compat) >= 2.0 +BuildRequires: (php-composer(jasig/phpcas) >= 1.3 with php-composer(jasig/phpcas) < 2) +BuildRequires: (php-composer(iamcal/lib_autolink) >= 1.7 with php-composer(iamcal/lib_autolink) < 2) +BuildRequires: (php-composer(phpmailer/phpmailer) >= 5.2 with php-composer(phpmailer/phpmailer) < 6) +BuildRequires: (php-composer(sabre/vobject) >= 4.1 with php-composer(sabre/vobject) < 5) +BuildRequires: (php-composer(simplepie/simplepie) >= 1.5 with php-composer(simplepie/simplepie) < 2) +BuildRequires: (php-composer(tecnickcom/tcpdf) >= 6.2.16 with php-composer(tecnickcom/tcpdf) < 7) +BuildRequires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2) +BuildRequires: (php-autoloader(zendframework/zend-cache) >= 2.7 with php-autoloader(zendframework/zend-cache) < 3) +BuildRequires: (php-autoloader(zendframework/zend-i18n) >= 2.7 with php-autoloader(zendframework/zend-i18n) < 3) +BuildRequires: (php-autoloader(zendframework/zend-serializer) >= 2.7 with php-autoloader(zendframework/zend-serializer) < 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) # 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(guzzlehttp/guzzle) >= 6 with php-composer(guzzlehttp/guzzle) < 7) +BuildRequires: (php-composer(atoum/atoum) >= 3.3 with php-composer(atoum/atoum) < 4) %endif -BuildRequires: php-cli -BuildRequires: php-composer(natxet/CssMin) < 4 -BuildRequires: php-composer(natxet/CssMin) >= 3.0 -BuildRequires: php-composer(patchwork/jsqueeze) < 3 -BuildRequires: php-composer(patchwork/jsqueeze) >= 2.0 +# To minimize assets +BuildRequires: (php-composer(natxet/CssMin) >= 3.0 with php-composer(natxet/CssMin) < 4) +BuildRequires: (php-composer(patchwork/jsqueeze) >= 2.0 with php-composer(patchwork/jsqueeze) < 3) # Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -137,31 +121,19 @@ Requires: php-xml Requires: php-xmlrpc Requires: php-zlib Requires: php-htmLawed -Requires: php-composer(jasig/phpcas) < 2 -Requires: php-composer(jasig/phpcas) >= 1.3 -Requires: php-composer(iamcal/lib_autolink) < 2 -Requires: php-composer(iamcal/lib_autolink) >= 1.7 -Requires: php-composer(phpmailer/phpmailer) < 6 -Requires: php-composer(phpmailer/phpmailer) >= 5.2 -Requires: php-composer(sabre/vobject) < 5 -Requires: php-composer(sabre/vobject) >= 4.1 -Requires: php-composer(simplepie/simplepie) < 2 -Requires: php-composer(simplepie/simplepie) >= 1.5 -Requires: php-composer(tecnickcom/tcpdf) < 7 -Requires: php-composer(tecnickcom/tcpdf) >= 6.2.16 -Requires: php-phpunit-diff >= 1.4 -Requires: php-autoloader(zendframework/zend-cache) < 3 -Requires: php-autoloader(zendframework/zend-cache) >= 2.7 -Requires: php-autoloader(zendframework/zend-i18n) < 3 -Requires: php-autoloader(zendframework/zend-i18n) >= 2.7 -Requires: php-autoloader(zendframework/zend-serializer) < 3 -Requires: php-autoloader(zendframework/zend-serializer) >= 2.7 -Requires: php-composer(michelf/php-markdown) < 2 -Requires: php-composer(michelf/php-markdown) >= 1.6 -Requires: php-composer(true/punycode) < 3 -Requires: php-composer(true/punycode) >= 2.1 -Requires: php-composer(paragonie/random_compat) < 3 -Requires: php-composer(paragonie/random_compat) >= 2.0 +Requires: (php-composer(jasig/phpcas) >= 1.3 with php-composer(jasig/phpcas) < 2) +Requires: (php-composer(iamcal/lib_autolink) >= 1.7 with php-composer(iamcal/lib_autolink) < 2) +Requires: (php-composer(phpmailer/phpmailer) >= 5.2 with php-composer(phpmailer/phpmailer) < 6) +Requires: (php-composer(sabre/vobject) >= 4.1 with php-composer(sabre/vobject) < 5) +Requires: (php-composer(simplepie/simplepie) >= 1.5 with php-composer(simplepie/simplepie) < 2) +Requires: (php-composer(tecnickcom/tcpdf) >= 6.2.16 with php-composer(tecnickcom/tcpdf) < 7) +Requires: (php-composer(sebastian/diff) >= 1.4 with php-composer(sebastian/diff) < 2) +Requires: (php-autoloader(zendframework/zend-cache) >= 2.7 with php-autoloader(zendframework/zend-cache) < 3) +Requires: (php-autoloader(zendframework/zend-i18n) >= 2.7 with php-autoloader(zendframework/zend-i18n) < 3) +Requires: (php-autoloader(zendframework/zend-serializer) >= 2.7 with php-autoloader(zendframework/zend-serializer) < 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) Requires: gnu-free-sans-fonts %if 0%{?fedora} || 0%{?rhel} >= 8 Requires: fontawesome-fonts >= 4.7.0 @@ -487,6 +459,9 @@ fi %changelog +* Wed Jun 20 2018 Remi Collet - 9.2.3-2 +- use range dependencies on F27+ + * Fri Apr 27 2018 Remi Collet - 9.2.3-1 - update to 9.2.3 - add dependency on sebastian/diff 1.4