summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-12-13 16:59:26 +0100
committerRemi Collet <remi@remirepo.net>2017-12-13 16:59:26 +0100
commit46a2fb3c14192723fba48e786e7c9dbccf31028c (patch)
tree3700ea84aff8b84b4423a97236fd1e75de836478
parent7529ac10ebae416762fb63f98d71190fc6abe8d0 (diff)
add upstream patch to allow upgrade from 9.1.7.1
-rw-r--r--f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch22
-rw-r--r--glpi.spec9
2 files changed, 30 insertions, 1 deletions
diff --git a/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch b/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch
new file mode 100644
index 0000000..06b1117
--- /dev/null
+++ b/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch
@@ -0,0 +1,22 @@
+From f18a6c947869f57c33d0f6f14029bcc9f4cede1f Mon Sep 17 00:00:00 2001
+From: Johan Cwiklinski <jcwiklinski@teclib.com>
+Date: Wed, 6 Dec 2017 09:21:03 +0100
+Subject: [PATCH] Handle 9.1.7 and 9.1.7.1 releases
+
+---
+ inc/update.class.php | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/inc/update.class.php b/inc/update.class.php
+index 75c25f8860..615c6db80c 100644
+--- a/inc/update.class.php
++++ b/inc/update.class.php
+@@ -389,6 +389,8 @@ public function doUpdates($current_version = null) {
+ case "9.1.4":
+ case "9.1.5":
+ case "9.1.6":
++ case "9.1.7":
++ case "9.1.7.1":
+ case "9.2-dev":
+ include_once("{$updir}update_91_92.php");
+ update91to92();
diff --git a/glpi.spec b/glpi.spec
index 53214c6..a122dda 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -41,7 +41,7 @@
Name: %{gh_project}
Version: 9.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -65,6 +65,9 @@ Source7: %{name}-user.ini
# RPM patch to use /etc/glpi/local_define.php
Patch1: glpi-localdef.patch
+# Upstream patch to allow update from 9.1.7.1
+Patch2: https://github.com/glpi-project/glpi/commit/f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch
+
BuildArch: noarch
BuildRequires: gettext
%if %{with_tests}
@@ -247,6 +250,7 @@ techniciens grâce à une maintenance plus cohérente.
%prep
%setup -q -n %{name}-%{gh_commit}
%patch1 -p1
+%patch2 -p1
grep %{version} inc/define.php
@@ -524,6 +528,9 @@ fi
%changelog
+* Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 9.2.1-6
+- add upstream patch to allow upgrade from 9.1.7.1
+
* Fri Nov 24 2017 Remi Collet <remi@remirepo.net> - 9.2.1-5
- switch to fedora/autoloader