diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | glpi.spec | 19 |
2 files changed, 10 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 8923385..3788f2a 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "zendframework/zend-serializer": "^2.8" }, "require-dev": { - "atoum/atoum": "dev-master", + "atoum/atoum": "^3.4", "atoum/telemetry-extension": "^1.0", "consolidation/robo": "^1.0", "fzaninotto/Faker": "^1.7", @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit b7f90388babf6b621dff121701b69f8d20124e77 +%global gh_commit 7fbee4f15b37c98f6f2078bd10634ef02b5edc25 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -52,10 +52,10 @@ %endif Name: %{gh_project} -%global upstream_version 9.4.5 +%global upstream_version 9.4.6 #global upstream_prever RC2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -77,9 +77,6 @@ Source7: %{name}-user.ini # allow to install in /usr/bin Patch0: %{name}-bin.patch -# Upstream patches -Patch1: https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/6783.patch -Patch2: https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/6921.patch BuildArch: noarch BuildRequires: gettext @@ -112,7 +109,7 @@ BuildRequires: (php-composer(symfony/console) >= 3.4 with php BuildRequires: (php-composer(leafo/scssphp) >= 0.7.7 with php-composer(leafo/scssphp) < 1) # 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) +BuildRequires: (php-composer(atoum/atoum) >= 3.4 with php-composer(atoum/atoum) < 4) BuildRequires: (php-composer(mikey179/vfsStream) >= 1.6 with php-composer(mikey179/vfsStream) < 2) # remirepo:40 %else @@ -151,7 +148,7 @@ BuildRequires: php-symfony3-console >= 3.4 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(atoum/atoum) >= 3.4 BuildRequires: php-composer(mikey179/vfsStream) < 2 BuildRequires: php-composer(mikey179/vfsStream) >= 1.6 %endif @@ -323,8 +320,6 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 -%patch2 -p1 grep %{upstream_version} inc/define.php @@ -620,6 +615,10 @@ fi %changelog +* Tue May 05 2020 Johan Cwiklinski <jcwiklinski AT teclib DOT com> - 9.4.6-1 +- update to 9.4.6 +- drop patches applied upstream + * Mon Feb 10 2020 Remi Collet <remi@remirepo.net> - 9.4.5-3 - switch test suite on UDS using patch from https://github.com/glpi-project/glpi/pull/6921 |