summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glpi-0.84-zend.patch55
-rw-r--r--glpi.spec12
2 files changed, 6 insertions, 61 deletions
diff --git a/glpi-0.84-zend.patch b/glpi-0.84-zend.patch
deleted file mode 100644
index f8de812..0000000
--- a/glpi-0.84-zend.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: branches/0.84-bugfixes/config/based_config.php
-===================================================================
---- branches/0.84-bugfixes/config/based_config.php (revision 21914)
-+++ branches/0.84-bugfixes/config/based_config.php (revision 21915)
-@@ -138,11 +138,10 @@
-
- // Default Zend_Loader path
- if (!defined("GLPI_ZEND_PATH")) {
-- define("GLPI_ZEND_PATH", GLPI_ROOT."/lib");
-+ define("GLPI_ZEND_PATH", GLPI_ROOT."/lib/Zend");
-
-- # if Zend installed, use (in config_path.php)
-- # define("GLPI_ZEND_PATH", "/usr/share/php/"); // if not in standard include_path
-- # define("GLPI_ZEND_PATH", ""); // if already in include_path
-+ # if Zend Framework 2 available in system, use (in config_path.php)
-+ # define('GLPI_ZEND_PATH', '/usr/share/php/Zend');
- }
-
- // Default SimplePie path
-Index: branches/0.84-bugfixes/inc/autoload.function.php
-===================================================================
---- branches/0.84-bugfixes/inc/autoload.function.php (revision 21914)
-+++ branches/0.84-bugfixes/inc/autoload.function.php (revision 21915)
-@@ -289,16 +289,6 @@
- ezcBase::autoload($classname);
- return true;
- }
-- // Is Zend class ?
--// if (preg_match('/^Zend/',$classname,$matches)) {
--// if (GLPI_ZEND_PATH) {
--// set_include_path(GLPI_ZEND_PATH . PATH_SEPARATOR . get_include_path());
--// }
--// require_once("Zend/Loader.php");
--//
--// Zend_Loader::loadClass($classname);
--// return true;
--// }
-
- // Do not try to load phpcas using GLPI autoload
- if (preg_match('/^CAS_.*/', $classname)) {
-@@ -323,11 +313,9 @@
- }
- }
-
--require_once (GLPI_ROOT . '/lib/Zend/Loader/ClassMapAutoloader.php');
--$loader = new Zend\Loader\ClassMapAutoloader();
--// Register the class map:
--$loader->registerAutoloadMap(GLPI_ROOT . '/lib/Zend/autoload_classmap.php');
--// Register with spl_autoload:
-+require_once (GLPI_ZEND_PATH . '/Loader/StandardAutoloader.php');
-+$option = array(Zend\Loader\StandardAutoloader::LOAD_NS => array('Zend' => GLPI_ZEND_PATH));
-+$loader = new Zend\Loader\StandardAutoloader($option);
- $loader->register();
-
- // SimplePie autoloader
diff --git a/glpi.spec b/glpi.spec
index 8e6b88c..061070a 100644
--- a/glpi.spec
+++ b/glpi.spec
@@ -9,7 +9,7 @@
%global useselinux 1
Name: glpi
-Version: 0.84.2
+Version: 0.84.3
Release: 1%{?dist}
Summary: Free IT asset management software
Summary(fr): Gestion Libre de Parc Informatique
@@ -17,7 +17,7 @@ Summary(fr): Gestion Libre de Parc Informatique
Group: Applications/Internet
License: GPLv2+ and GPLv3+
URL: http://www.glpi-project.org/
-Source0: https://forge.indepnet.net/attachments/download/1593/glpi-0.84.2.tar.gz
+Source0: https://forge.indepnet.net/attachments/download/1615/glpi-0.84.3.tar.gz
Source1: glpi-httpd.conf
Source2: glpi-config_path.php
@@ -26,9 +26,6 @@ Source3: glpi-logrotate
# Switch all internal cron tasks to system
Patch0: glpi-0.84-cron.patch
-# https://forge.indepnet.net/repositories/revision/glpi/21915
-Patch1: glpi-0.84-zend.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
@@ -99,7 +96,6 @@ techniciens grâce à une maintenance plus cohérente.
%setup -q -n glpi
%patch0 -p0
-%patch1 -p2
find . -name \*.orig -exec rm {} \; -print
@@ -276,6 +272,10 @@ fi
%changelog
+* Sun Nov 3 2013 Remi Collet <remi@fedoraproject.org> - 0.84.3-1
+- update to 0.84.3
+ https://forge.indepnet.net/projects/glpi/versions/973
+
* Wed Oct 2 2013 Remi Collet <remi@fedoraproject.org> - 0.84.2-1
- update to 0.84.2
- add upstream patch for Zend autoload