From 46a2fb3c14192723fba48e786e7c9dbccf31028c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 13 Dec 2017 16:59:26 +0100
Subject: add upstream patch to allow upgrade from 9.1.7.1

---
 glpi.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'glpi.spec')

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
 
-- 
cgit