From a729d8519be57eac89f071319fe802b7bbf59cb2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Nov 2017 10:31:57 +0100 Subject: add max version for all dependencies fix depdendency issue with php-phpmailer6 EL7: remove SELinux rules as default policy includes them --- glpi.spec | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/glpi.spec b/glpi.spec index 2b02d3c..fa91b16 100644 --- a/glpi.spec +++ b/glpi.spec @@ -14,9 +14,7 @@ %global gh_project glpi -%if 0%{?fedora} < 20 -# See https://bugzilla.redhat.com/1033025 -# selinux-policy : Please include policy for GLPI +%if 0%{?rhel} == 6 %global useselinux 1 %else # System policy includes GLPI rules @@ -44,7 +42,7 @@ Name: %{gh_project} Version: 9.1.6 %global schema 9.1.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -76,19 +74,30 @@ BuildRequires: mariadb-server BuildRequires: hostname # PHP libs BuildRequires: php-htmLawed +BuildRequires: php-composer(zendframework/zend-cache) < 3 BuildRequires: php-composer(zendframework/zend-cache) >= 2.4 +BuildRequires: php-composer(zendframework/zend-i18n) < 3 BuildRequires: php-composer(zendframework/zend-i18n) >= 2.4 +BuildRequires: php-composer(zendframework/zend-loader) < 3 BuildRequires: php-composer(zendframework/zend-loader) >= 2.4 +BuildRequires: php-composer(guzzlehttp/guzzle) < 6 BuildRequires: php-composer(guzzlehttp/guzzle) >= 5 -BuildRequires: php-composer(guzzlehttp/guzzle) < 6 +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(sabre/vobject) < 4 BuildRequires: php-composer(sabre/vobject) >= 3.4 +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 +BuildRequires: php-composer(simplepie/simplepie) < 2 BuildRequires: php-composer(simplepie/simplepie) >= 1.5 +BuildRequires: php-composer(phpmailer/phpmailer) < 6 BuildRequires: php-composer(phpmailer/phpmailer) >= 5.2 # 6.2.13 to ensure we have the classmap autoloader +BuildRequires: php-composer(tecnickcom/tcpdf) < 7 BuildRequires: php-composer(tecnickcom/tcpdf) >= 6.2.13 BuildRequires: php-mysqli BuildRequires: php-xmlrpc @@ -127,18 +136,29 @@ Requires: php-wddx Requires: php-xmlrpc Requires: php-zlib Requires: php-htmLawed +Requires: php-composer(zendframework/zend-cache) < 3 Requires: php-composer(zendframework/zend-cache) >= 2.4 +Requires: php-composer(zendframework/zend-i18n) < 3 Requires: php-composer(zendframework/zend-i18n) >= 2.4 +Requires: php-composer(zendframework/zend-loader) < 3 Requires: php-composer(zendframework/zend-loader) >= 2.4 +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(sabre/vobject) < 4 Requires: php-composer(sabre/vobject) >= 3.4 +Requires: php-composer(michelf/php-markdown) < 2 Requires: php-composer(michelf/php-markdown) >= 1.6 # upstream ask 2.1, compatibility with 2.0 ensure by autoloader +Requires: php-composer(true/punycode) < 3 Requires: php-composer(true/punycode) >= 2.1 +Requires: php-composer(simplepie/simplepie) < 2 Requires: php-composer(simplepie/simplepie) >= 1.5 +Requires: php-composer(phpmailer/phpmailer) < 6 Requires: php-composer(phpmailer/phpmailer) >= 5.2 # 6.2.13 to ensure we have the classmap autoloader +Requires: php-composer(tecnickcom/tcpdf) < 7 Requires: php-composer(tecnickcom/tcpdf) >= 6.2.13 Requires: php-composer(zetacomponents/graph) @@ -441,6 +461,11 @@ fi %changelog +* Thu Nov 23 2017 Remi Collet - 9.1.6-3 +- add max version for all dependencies +- fix depdendency issue with php-phpmailer6 +- EL7: remove SELinux rules as default policy includes them + * Sat Jul 22 2017 Johan Cwiklinski - 9.1.6-1 - update to 9.1.6 -- cgit