summaryrefslogtreecommitdiffstats
path: root/glpi-dev.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-02-27 10:35:16 +0100
committerRemi Collet <fedora@famillecollet.com>2015-02-27 10:35:16 +0100
commit4c68e82fecb2ee4211b467462ab4a7adaa7fa963 (patch)
tree0b019b005d2c543045d2d6eb9b7d0078eefb1b5e /glpi-dev.spec
parenta327437300fdd612a26d17c7abf6779c9a43fd7f (diff)
glpi: 0.85.2 with 2 upstream fix
Diffstat (limited to 'glpi-dev.spec')
-rw-r--r--glpi-dev.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/glpi-dev.spec b/glpi-dev.spec
index 46da769..a7f364c 100644
--- a/glpi-dev.spec
+++ b/glpi-dev.spec
@@ -28,7 +28,7 @@
Name: glpi
Version: 0.85.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -44,6 +44,10 @@ Source4: glpi-nginx.conf
# Switch all internal cron tasks to system
Patch0: glpi-0.85-cron.patch
+# See https://forge.indepnet.net/projects/glpi/repository/revisions/23370
+Patch1: glpi-0.85-upload.patch
+# See https://forge.indepnet.net/projects/glpi/repository/revisions/23365
+Patch2: glpi-0.85-bug5218.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -125,6 +129,8 @@ techniciens grâce à une maintenance plus cohérente.
%setup -q -n glpi
%patch0 -p0
+%patch1 -p1
+%patch2 -p1
find . -name \*.orig -exec rm {} \; -print
@@ -307,6 +313,10 @@ fi
%changelog
+* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> - 0.85.2-2
+- add security fix https://forge.indepnet.net/issues/5218
+- add fix for temporary directory relocation
+
* Wed Jan 21 2015 Remi Collet <remi@fedoraproject.org> - 0.85.2-1
- update to 0.85.2
https://forge.indepnet.net/versions/1110