summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-04-01 15:15:33 +0200
committerRemi Collet <fedora@famillecollet.com>2016-04-01 15:15:33 +0200
commit5b64ff8f30058852f613b7a4eb795edabc350baa (patch)
treeaa68409e9936c743fe6e7c4ec95efac2d05e722c
parent9ad8cc9899a424efe1c670caf7b1ec05fbdc2aa7 (diff)
GLPI 0.90.2
-rw-r--r--glpi-0.90-zf25.patch26
-rw-r--r--glpi.spec10
2 files changed, 5 insertions, 31 deletions
diff --git a/glpi-0.90-zf25.patch b/glpi-0.90-zf25.patch
deleted file mode 100644
index 0a16f81..0000000
--- a/glpi-0.90-zf25.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dc5faa994b3103d7740e88c5de79969f6e58a237 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Thu, 24 Mar 2016 19:21:05 +0100
-Subject: [PATCH] Fix compat with ZF 2.5
-
-2.4: Zend\Cache\Exception\ExtensionNotLoadedException
-2.5: Zend\ServiceManager\Exception\ServiceNotCreatedException
-
-(cherry picked from commit 9474d5743122d4b1fc3bd5965d0eb798a93ad668)
----
- inc/session.class.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/inc/session.class.php b/inc/session.class.php
-index f5deef5..dd572d7 100644
---- a/inc/session.class.php
-+++ b/inc/session.class.php
-@@ -578,7 +578,7 @@ static function loadLanguage($forcelang='') {
- try {
- $cache = Zend\Cache\StorageFactory::factory(array('adapter' => 'apc'));
- $TRANSLATE->setCache($cache);
-- } catch (Zend\Cache\Exception\ExtensionNotLoadedException $e) {
-+ } catch (Exception $e) {
- // ignore when APC not available
- // toolbox::logDebug($e->getMessage());
- }
diff --git a/glpi.spec b/glpi.spec
index 228d99f..f18a271 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -27,8 +27,8 @@
%endif
Name: glpi
-Version: 0.90.1
-Release: 4%{?dist}
+Version: 0.90.2
+Release: 1%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -47,8 +47,6 @@ 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
@@ -132,7 +130,6 @@ techniciens grâce à une maintenance plus cohérente.
%patch0 -p0
%patch1 -p0
-%patch2 -p1
find . -name \*.orig -exec rm {} \; -print
@@ -326,6 +323,9 @@ fi
%changelog
+* Fri Apr 1 2016 Remi Collet <remi@fedoraproject.org> - 0.90.2-1
+- update to 0.90.2
+
* 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