diff --git a/.gitignore b/.gitignore index f654dc6..73ef06e 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ glpi-0.72.4-11497.tar.gz /glpi-0.90.5.tar.gz /glpi-9.1-06a1bce.tar.gz /glpi-9.1.1-80328ba.tar.gz +/glpi-9.1.2-3dedf34.tar.gz diff --git a/glpi.spec b/glpi.spec index 195ee82..9248cfb 100644 --- a/glpi.spec +++ b/glpi.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 80328baf38e2d6fe6cf269b43ed0edc80c64d89d +%global gh_commit 3dedf3453ae2f4b3e0e26772e7ce00182aeb4e5d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -35,9 +35,9 @@ %global with_tests 0%{!?_without_tests:1} Name: %{gh_project} -Version: 9.1.1 +Version: 9.1.2 %global schema 9.1.1 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -60,7 +60,9 @@ BuildRequires: gettext BuildRequires: php-cli BuildRequires: %{_bindir}/phpunit BuildRequires: mariadb-server -#PHP libs +# Missing in mariadb +BuildRequires: hostname +# PHP libs BuildRequires: php-htmLawed BuildRequires: php-composer(zendframework/zend-cache) >= 2.4 BuildRequires: php-composer(zendframework/zend-i18n) >= 2.4 @@ -72,8 +74,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 -# See https://bugzilla.redhat.com/1353451 -BuildRequires: php-simplepie +BuildRequires: php-composer(simplepie/simplepie) >= 1.4 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 @@ -123,8 +124,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 -# See https://bugzilla.redhat.com/1353451 -Requires: php-simplepie +Requires: php-composer(simplepie/simplepie) >= 1.4 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 @@ -331,7 +331,7 @@ done 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_US || RET=1 +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 @@ -418,6 +418,10 @@ fi %changelog +* Mon Jan 23 2017 Johan Cwiklinski - 9.1.2-1 +- update to 9.1.2 +- add missing hostname BR from MariaDB package + * Mon Jan 9 2017 Remi Collet - 9.1.1-3 - use new tcpdf classmap autoloader diff --git a/sources b/sources index e49e056..4753176 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -543b82901aedc3ec84138f3df32a5800 glpi-9.1.1-80328ba.tar.gz +SHA512 (glpi-9.1.2-3dedf34.tar.gz) = e62313a6bddd2b9de0f8f47a379a10604c307357403e88fad01db98c22b2922fc89d6a8c2c1b504c7870579bd0ae7a34d750c5f75b3fb0f84b5947250a9b9ff5