summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-03-25 07:25:32 +0100
committerRemi Collet <fedora@famillecollet.com>2016-03-25 07:25:32 +0100
commit9ad8cc9899a424efe1c670caf7b1ec05fbdc2aa7 (patch)
treecee5422c10eccede7100fb3c32ff0bf98f34f972
parente938c90f9e6bf576b5e4cf31511589c59f621a31 (diff)
glpi: add upstream patch to fix compatibility with ZF 2.5 + recommend APCu
-rw-r--r--glpi.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/glpi.spec b/glpi.spec
index a941e95..228d99f 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -28,7 +28,7 @@
Name: glpi
Version: 0.90.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -47,6 +47,8 @@ Source4: glpi-nginx.conf
Patch0: glpi-0.90-cron.patch
# Fix autoloader
Patch1: glpi-0.90-autoload.patch
+# Upstream patch for ZF 2.5
+Patch2: glpi-0.90-zf25.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -101,6 +103,9 @@ Requires(post): /usr/sbin/semanage
Requires(postun): /usr/sbin/semanage
%endif
Requires: crontabs
+%if 0%{?fedora} >= 22
+Recommends: php-pecl-apcu
+%endif
%description
@@ -127,6 +132,7 @@ techniciens grâce à une maintenance plus cohérente.
%patch0 -p0
%patch1 -p0
+%patch2 -p1
find . -name \*.orig -exec rm {} \; -print
@@ -320,6 +326,10 @@ fi
%changelog
+* Thu Mar 24 2016 Remi Collet <remi@fedoraproject.org> - 0.90.1-4
+- add upstream patch to fix compatibility with ZF 2.5
+- recommend APCu
+
* Thu Feb 18 2016 Remi Collet <remi@fedoraproject.org> - 0.90.1-3
- fix Zend autoloader (to allow ZF 2.5)