summaryrefslogtreecommitdiffstats
path: root/glpi.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-07-23 06:35:52 +0200
committerRemi Collet <fedora@famillecollet.com>2016-07-23 06:35:52 +0200
commit7a28706a1a1e3f9acddd8a67ef860ebf03814483 (patch)
tree5e01f8d8e004e889339ea5bc0c967225c0a0431f /glpi.spec
parent095d9c07713c56e0da0c79efc306f6fc860c4033 (diff)
glpi: fix regression
Diffstat (limited to 'glpi.spec')
-rw-r--r--glpi.spec9
1 files changed, 7 insertions, 2 deletions
diff --git a/glpi.spec b/glpi.spec
index 67e9094..23f2c76 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -28,7 +28,7 @@
Name: glpi
Version: 0.90.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -47,8 +47,9 @@ Source4: glpi-nginx.conf
Patch0: glpi-0.90-cron.patch
# Fix autoloader
Patch1: glpi-0.90-autoload.patch
-# Upstream patch
+# Upstream patches
Patch2: glpi-0.90-upstream.patch
+Patch3: glpi-0.90-upstream2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -134,6 +135,7 @@ grep %{version} config/define.php
%patch0 -p0
%patch1 -p0
%patch2 -p1
+%patch3 -p1
find . -name \*.orig -exec rm {} \; -print
@@ -331,6 +333,9 @@ fi
%changelog
+* Sat Jul 23 2016 Remi Collet <remi@fedoraproject.org> - 0.90.4-2
+- fix regression in document form, adding upstream patch
+
* Tue Jul 19 2016 Remi Collet <remi@fedoraproject.org> - 0.90.4-1
- update to 0.90.4
https://github.com/glpi-project/glpi/issues?q=milestone:0.90.4