summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-04-27 16:34:51 +0200
committerRemi Collet <remi@remirepo.net>2018-04-27 16:34:51 +0200
commita11b43c7a5aac215f3cae1aa1efc97f44ce57b2f (patch)
tree118d07bdd10af2a7a144255ba70327a10bce6b51
parentd793aaaea42dbaaea43e0a06431c860272ca5b9f (diff)
use range dependencies on F27+
-rw-r--r--glpi.spec160
1 files changed, 94 insertions, 66 deletions
diff --git a/glpi.spec b/glpi.spec
index 5c308fd..67c09f5 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -41,7 +41,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
@@ -63,8 +63,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
@@ -72,53 +72,71 @@ 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
# remirepo:1
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
-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
-# remirepo:8
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+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) >= 6 with php-composer(guzzlehttp/guzzle) < 7)
+BuildRequires: (php-composer(atoum/atoum) >= 3.3 with php-composer(atoum/atoum) < 4)
+# remirepo:33
%else
+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(simplepie/simplepie) >= 1.5
+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-composer(zendframework/zend-cache) < 3
BuildRequires: php-composer(zendframework/zend-cache) >= 2.7
BuildRequires: php-composer(zendframework/zend-i18n) < 3
BuildRequires: php-composer(zendframework/zend-i18n) >= 2.7
BuildRequires: php-composer(zendframework/zend-serializer) < 3
BuildRequires: php-composer(zendframework/zend-serializer) >= 2.7
-%endif
-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(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
# 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) < 7
+BuildRequires: php-composer(guzzlehttp/guzzle) >= 6
+BuildRequires: php-composer(atoum/atoum) < 4
+BuildRequires: php-composer(atoum/atoum) >= 3.3
+%endif
+%endif
+# To minimize assets
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+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)
+# remirepo:6
+%else
+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
%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
# Autoloader
BuildRequires: php-composer(fedora/autoloader)
@@ -155,29 +173,36 @@ 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
# remirepo:1
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
-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
-# remirepo:9
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+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)
+# remirepo:28
%else
+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-composer(zendframework/zend-cache) < 3
Requires: php-composer(zendframework/zend-cache) >= 2.7
Requires: php-composer(zendframework/zend-i18n) < 3
@@ -185,13 +210,13 @@ Requires: php-composer(zendframework/zend-i18n) >= 2.7
Requires: php-composer(zendframework/zend-serializer) < 3
Requires: php-composer(zendframework/zend-serializer) >= 2.7
Requires: php-composer(zendframework/zend-loader)
+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
%endif
-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: gnu-free-sans-fonts
%if 0%{?fedora} || 0%{?rhel} >= 8
Requires: fontawesome-fonts >= 4.7.0
@@ -522,6 +547,9 @@ fi
%changelog
+* Fri Apr 27 2018 Remi Collet <remi@remirepo.net> - 9.2.3-2
+- use range dependencies on F27+
+
* Fri Apr 27 2018 Remi Collet <remi@remirepo.net> - 9.2.3-1
- update to 9.2.3
- add dependency on sebastian/diff 1.4