diff --git a/.gitignore b/.gitignore index 73ef06e..181d670 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ glpi-0.72.4-11497.tar.gz /glpi-9.1-06a1bce.tar.gz /glpi-9.1.1-80328ba.tar.gz /glpi-9.1.2-3dedf34.tar.gz +/glpi-9.1.3-c6f470b.tar.gz diff --git a/glpi.spec b/glpi.spec index 7702447..97313c8 100644 --- a/glpi.spec +++ b/glpi.spec @@ -7,9 +7,8 @@ # Please, preserve the changelog entries # -%global gh_commit 3dedf3453ae2f4b3e0e26772e7ce00182aeb4e5d +%global gh_commit c6f470be3d4b0728333f54ed953950c14de68501 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -#global gh_date 20160923 %global gh_owner glpi-project %global gh_project glpi @@ -35,9 +34,9 @@ %global with_tests 0%{!?_without_tests:1} Name: %{gh_project} -Version: 9.1.2 -%global schema 9.1.1 -Release: 3%{?dist} +Version: 9.1.3 +%global schema 9.1.3 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -58,7 +57,12 @@ BuildArch: noarch BuildRequires: gettext %if %{with_tests} BuildRequires: php-cli -BuildRequires: %{_bindir}/phpunit +%if 0%{?fedora} >= 26 +%global phpunit %{_bindir}/phpunit6 +%else +%global phpunit %{_bindir}/phpunit +%endif +BuildRequires: %{phpunit} BuildRequires: mariadb-server # Missing in mariadb BuildRequires: hostname @@ -74,7 +78,7 @@ BuildRequires: php-composer(iamcal/lib_autolink) >= 1.7 BuildRequires: php-composer(sabre/vobject) >= 3.4 BuildRequires: php-composer(michelf/php-markdown) >= 1.6 BuildRequires: php-composer(true/punycode) >= 2 -BuildRequires: php-composer(simplepie/simplepie) >= 1.4 +BuildRequires: php-composer(simplepie/simplepie) >= 1.5 BuildRequires: php-composer(phpmailer/phpmailer) >= 5.2 # 6.2.13 to ensure we have the classmap autoloader BuildRequires: php-composer(tecnickcom/tcpdf) >= 6.2.13 @@ -124,7 +128,7 @@ Requires: php-composer(sabre/vobject) >= 3.4 Requires: php-composer(michelf/php-markdown) >= 1.6 # upstream ask 2.1, compatibility with 2.0 ensure by autoloader Requires: php-composer(true/punycode) >= 2.1 -Requires: php-composer(simplepie/simplepie) >= 1.4 +Requires: php-composer(simplepie/simplepie) >= 1.5 Requires: php-composer(phpmailer/phpmailer) >= 5.2 # 6.2.13 to ensure we have the classmap autoloader Requires: php-composer(tecnickcom/tcpdf) >= 6.2.13 @@ -333,7 +337,7 @@ cp %{SOURCE12} config/config_path.php : Run upstream test suite php tools/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_GB || RET=1 -%{_bindir}/phpunit --verbose || RET=1 +%{phpunit} --verbose || RET=1 : Cleanup if [ -s $MYSQL_PID_FILE ]; then @@ -418,6 +422,11 @@ fi %changelog +* Fri Apr 28 2017 Remi Collet - 9.1.3-1 +- update to 9.1.2 +- use phpunit6 on F26+ +- raise dependency on simplepie/simplepie 1.5 + * Tue Feb 21 2017 Remi Collet - 9.1.2-3 - fix autoloader to allow sabre/vobject version 4 diff --git a/sources b/sources index 4753176..d9fe23f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glpi-9.1.2-3dedf34.tar.gz) = e62313a6bddd2b9de0f8f47a379a10604c307357403e88fad01db98c22b2922fc89d6a8c2c1b504c7870579bd0ae7a34d750c5f75b3fb0f84b5947250a9b9ff5 +SHA512 (glpi-9.1.3-c6f470b.tar.gz) = 1bc11fb2d342bb72d34aecb5e550a6d5ef4a782ccab149e6ac57d038a147ce889029518c1e622ccf9ef872ec76c0d93902abf83ef3f0f400466de2997c7777d9