diff options
| -rw-r--r-- | f18a6c947869f57c33d0f6f14029bcc9f4cede1f.patch | 22 | ||||
| -rw-r--r-- | glpi.spec | 9 |
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(); @@ -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 |