summaryrefslogtreecommitdiffstats
path: root/glpi.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-15 14:15:31 +0100
committerRemi Collet <remi@remirepo.net>2019-01-15 14:15:31 +0100
commitb7ba8bcddb63cc89bcbe348bd141033806cffcee (patch)
tree0460a671507baba3feee4b2512c94ab4a822f938 /glpi.spec
parent4f9dcd0f8eec44bcda8e4cbb9b40f17aca483754 (diff)
v9.4.0RC2
Diffstat (limited to 'glpi.spec')
-rw-r--r--glpi.spec12
1 files changed, 6 insertions, 6 deletions
diff --git a/glpi.spec b/glpi.spec
index f727517..32ebb66 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
-%global gh_commit a91cd4fae005b30123cf883bddf837dfd26a959b
+%global gh_commit d1318f84e7278c0fe46419db3c1743a147a30621
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20160923
%global gh_owner glpi-project
@@ -53,9 +53,9 @@
Name: %{gh_project}
%global upstream_version 9.4.0
-%global upstream_prever RC1
+%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,8 +77,6 @@ Source7: %{name}-user.ini
# allow to install in /usr/bin
Patch0: %{name}-bin.patch
-# for tests
-Patch1: https://patch-diff.githubusercontent.com/raw/glpi-project/glpi/pull/5200.patch
BuildArch: noarch
BuildRequires: gettext
@@ -322,7 +320,6 @@ techniciens grâce à une maintenance plus cohérente.
%prep
%setup -q -n %{name}-%{gh_commit}
%patch0 -p1 -b .rpm
-%patch1 -p1 -b .pr5200
grep %{upstream_version} inc/define.php
@@ -610,6 +607,9 @@ fi
%changelog
+* Tue Jan 15 2019 Remi Collet <remi@remirepo.net> - 9.4.0~RC2-1
+- update to 9.4.0 RC2
+
* Fri Jan 4 2019 Remi Collet <remi@remirepo.net> - 9.4.0~RC1-3
- open https://github.com/glpi-project/glpi/pull/5200 fix tests
- re-enable test suite