summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glpi.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/glpi.spec b/glpi.spec
index 97a16b9..d3bee69 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -56,7 +56,7 @@ Name: %{gh_project}
#global upstream_prever RC2
# use 9.3.0~RC2 < 9.3 (for plugin compatibility check)
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -277,6 +277,9 @@ Recommends: php-pecl-apcu
Recommends: php-opcache
%endif
+# see https://github.com/glpi-project/glpi/issues/4837
+Conflicts: glpi-fusioninventory < 9.3+1.2
+
%description
GLPI is the Information Resource-Manager with an additional Administration-
@@ -586,6 +589,10 @@ fi
%changelog
+* Fri Nov 2 2018 Remi Collet <remi@remirepo.net> - 9.3.2-2
+- version 9.3.2 conflicts with glpi-fusioninventory < 9.3+1.2
+ see https://github.com/glpi-project/glpi/issues/4837
+
* Fri Oct 26 2018 Remi Collet <remi@remirepo.net> - 9.3.2-1
- update to 9.3.2
- open https://github.com/glpi-project/glpi/issues/4837 BC break