diff --git a/.gitignore b/.gitignore index 3341452..c97a4fd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ glpi-0.72.4-11497.tar.gz /glpi-9.1.4-b2e6cd0.tar.gz /glpi-9.1.5-c7dc27d.tar.gz /glpi-9.1.6-2683ce0.tar.gz +/glpi-9.1.7.1-4205431.tar.gz +/glpi-9.2.1-3a7c596.tar.gz diff --git a/glpi.spec b/glpi.spec index 783869f..2aa89b3 100644 --- a/glpi.spec +++ b/glpi.spec @@ -7,15 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 2683ce0cfe4cce4786e52eec3cf2a54f54f01225 +%global gh_commit 420543182ca074976b5584ba049e29f87024462b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +#global gh_date 20160923 %global gh_owner glpi-project %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 @@ -34,9 +33,9 @@ %global with_tests 0%{!?_without_tests:1} Name: %{gh_project} -Version: 9.1.6 +Version: 9.1.7.1 %global schema 9.1.3 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -68,19 +67,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 @@ -119,18 +129,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) @@ -223,7 +244,6 @@ done %install - # ===== application ===== mkdir -p %{buildroot}/%{_datadir}/%{name} cp -a COPYING.txt *.php *.js apirest.md %{buildroot}/%{_datadir}/%{name}/ @@ -422,6 +442,9 @@ fi %changelog +* Wed Dec 6 2017 Remi Collet - 9.1.7.1-1 +- update to 9.1.7.1 + * Wed Jul 26 2017 Fedora Release Engineering - 9.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 46a728c..ccd7f20 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (glpi-9.1.6-2683ce0.tar.gz) = 444bbd574c255cb00125d97cc41e92dde1afaf79afa3c8ee7b614f6f5bdc1ce626b1092fad03f816e5abd1bb087badb418610605d093067904bd292b3b6fe131 +SHA512 (glpi-9.1.7.1-4205431.tar.gz) = 4e2ce7ba0aac378c5b6346066d4fc3eba4407a1348fc625a5cb0f01df6cb9423bf939839a3c25344cf64a53dbd011a3365292eeef443b7d18b0c0cfce9b4a161 +SHA512 (glpi-9.2.1-3a7c596.tar.gz) = 0e49b9f965019131b881b264a3f4ddd896aad26d21f1cedb66accf8605f8a89e8285ebe2e3b3a0880321b0b3300a2905144c8cc0dec7fa7b460e64a450d71b41