summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-04-11 13:33:15 +0200
committerRemi Collet <remi@remirepo.net>2019-04-11 13:33:15 +0200
commitd56299695c996e58811f91dd23a4a03954f58a52 (patch)
tree3840dae2f322d4cd7e4f2c2bbeb4d0ed171560e3
parentcc2d24274ca91ac02fe708a91dfdbd3241ee2251 (diff)
-rw-r--r--glpi.spec10
1 files changed, 5 insertions, 5 deletions
diff --git a/glpi.spec b/glpi.spec
index fdbd514..20a5852 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
-%global gh_commit 801d25b5e8249e951fb47dc8c42b5e7863ab1e34
+%global gh_commit 2039040a08456f86bbeeb42c6ecf38942ee6442a
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20160923
%global gh_owner glpi-project
@@ -52,7 +52,7 @@
%endif
Name: %{gh_project}
-%global upstream_version 9.4.1.1
+%global upstream_version 9.4.2
#global upstream_prever RC2
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 1%{?dist}
@@ -297,9 +297,6 @@ Requires: php-ldap
Requires: php-xmlrpc
%endif
-# see https://github.com/glpi-project/glpi/issues/4837
-Conflicts: glpi-fusioninventory < 1:9.3+1.2
-
%description
GLPI is the Information Resource-Manager with an additional Administration-
@@ -613,6 +610,9 @@ fi
%changelog
+* Thu Apr 11 2019 Remi Collet <remi@remirepo.net> - 9.4.2-1
+- update to 9.4.2
+
* Fri Mar 15 2019 Remi Collet <remi@remirepo.net> - 9.4.1.1-1
- update to 9.4.1.1