diff options
| -rw-r--r-- | 457e348266100a8d43720b614e898552d1fe24e5.patch | 67 | ||||
| -rw-r--r-- | glpi-9.2-config_path.php | 1 | ||||
| -rw-r--r-- | glpi.spec | 15 |
3 files changed, 8 insertions, 75 deletions
diff --git a/457e348266100a8d43720b614e898552d1fe24e5.patch b/457e348266100a8d43720b614e898552d1fe24e5.patch deleted file mode 100644 index b9435e0..0000000 --- a/457e348266100a8d43720b614e898552d1fe24e5.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 457e348266100a8d43720b614e898552d1fe24e5 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 28 Sep 2017 16:49:18 +0200 -Subject: [PATCH] config/config_path.php => inc/downstream.php - -ensure local_define is loaded before downstream.php ---- - inc/api.class.php | 6 ++++-- - inc/based_config.php | 11 +++++++++-- - inc/define.php | 4 ---- - 3 files changed, 13 insertions(+), 8 deletions(-) - -diff --git a/inc/api.class.php b/inc/api.class.php -index 3ae2966ce1..85eea1d74e 100644 ---- a/inc/api.class.php -+++ b/inc/api.class.php -@@ -247,8 +247,10 @@ protected function retrieveSession() { - $current = session_id(); - $session = trim($this->parameters['session_token']); - -- if (file_exists(GLPI_ROOT . "/config/config_path.php")) { -- include_once (GLPI_ROOT . "/config/config_path.php"); -+ if (file_exists(GLPI_ROOT . '/inc/downstream.php')) { -+ include_once (GLPI_ROOT . '/inc/downstream.php'); -+ } else if (file_exists(GLPI_ROOT . '/config/config_path.php')) { // For compatibility, deprecated -+ include_once (GLPI_ROOT . '/config/config_path.php'); - } - if (!defined("GLPI_SESSION_DIR")) { - define("GLPI_SESSION_DIR", GLPI_ROOT . "/files/_sessions"); -diff --git a/inc/based_config.php b/inc/based_config.php -index ac6dacb893..d952712f77 100644 ---- a/inc/based_config.php -+++ b/inc/based_config.php -@@ -46,9 +46,16 @@ - date_default_timezone_set(@date_default_timezone_get()); - } - -+// If this file exists, it is load -+if (file_exists(GLPI_ROOT. '/config/local_define.php')) { -+ require_once GLPI_ROOT. '/config/local_define.php'; -+} -+ - // If this file exists, it is load, allow to set configdir/dumpdir elsewhere --if (file_exists(GLPI_ROOT ."/config/config_path.php")) { -- include_once(GLPI_ROOT ."/config/config_path.php"); -+if (file_exists(GLPI_ROOT . '/inc/downstream.php')) { -+ include_once (GLPI_ROOT . '/inc/downstream.php'); -+} else if (file_exists(GLPI_ROOT . '/config/config_path.php')) { // For compatibility, deprecated -+ include_once (GLPI_ROOT . '/config/config_path.php'); - } - - // Default location for database configuration : config_db.php -diff --git a/inc/define.php b/inc/define.php -index b66e00cfdb..4df3619015 100644 ---- a/inc/define.php -+++ b/inc/define.php -@@ -34,10 +34,6 @@ - * @brief - */ - --if (file_exists(GLPI_CONFIG_DIR . '/local_define.php')) { -- require_once GLPI_CONFIG_DIR . '/local_define.php'; --} -- - // Current version of GLPI - define('GLPI_VERSION', '9.2'); - if (substr(GLPI_VERSION, -4) === '-dev') { diff --git a/glpi-9.2-config_path.php b/glpi-9.2-config_path.php index 30d30a0..5c0e672 100644 --- a/glpi-9.2-config_path.php +++ b/glpi-9.2-config_path.php @@ -27,6 +27,7 @@ defined('GLPI_RSS_DIR') or define('GLPI_RSS_DIR', GLPI_VAR_DIR . ' defined('GLPI_SESSION_DIR') or define('GLPI_SESSION_DIR', GLPI_VAR_DIR . '/_sessions'); defined('GLPI_TMP_DIR') or define('GLPI_TMP_DIR', GLPI_VAR_DIR . '/_tmp'); defined('GLPI_UPLOAD_DIR') or define('GLPI_UPLOAD_DIR', GLPI_VAR_DIR . '/_uploads'); +defined('GLPI_CACHE_DIR') or define('GLPI_CACHE_DIR', GLPI_VAR_DIR . '/_cache'); // Log defined('GLPI_LOG_DIR') or define('GLPI_LOG_DIR', '/var/log/glpi'); @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 43bade1249719184b83a197fb57167676f68aae5 +%global gh_commit 3a7c5969c0534d0b5bf27fef9c4d96f56147ae66 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20160923 %global gh_owner glpi-project @@ -42,8 +42,8 @@ %endif Name: %{gh_project} -Version: 9.2 -Release: 4%{?dist} +Version: 9.2.1 +Release: 1%{?dist} Summary: Free IT asset management software Summary(fr): Gestion Libre de Parc Informatique @@ -62,8 +62,6 @@ Source5: %{name}-fedora-autoloader.php # Temporary minify script, waiting for consolidation/robo Source6: %{name}-minify.php -# Upstream to use local_define.php and inc/downstream.php -Patch0: https://github.com/glpi-project/glpi/commit/457e348266100a8d43720b614e898552d1fe24e5.patch # RPM patch to use /etc/glpi/local_define.php Patch1: glpi-localdef.patch @@ -218,7 +216,6 @@ techniciens grâce à une maintenance plus cohérente. %prep %setup -q -n %{name}-%{gh_commit} -%patch0 -p1 %patch1 -p1 grep %{version} inc/define.php @@ -405,9 +402,8 @@ cp %{SOURCE12} inc/downstream.php : Run upstream test suite php tools/cliinstall.php --host=127.0.0.1:3308 --db=glpitest --user=root --tests --force --lang=en_GB || RET=1 -#atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/database || RET=1 atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/units || RET=1 -atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/api || RET=1 +atoum --debug --bootstrap-file tests/bootstrap.php --no-code-coverage --use-light-report --max-children-number 1 -d tests/web || RET=1 : Cleanup if [ -s $MYSQL_PID_FILE ]; then @@ -502,6 +498,9 @@ fi %changelog +* Thu Nov 16 2017 Remi Collet <remi@remirepo.net> - 9.2.1-1 +- update to 9.2.1 + * Wed Oct 11 2017 Remi Collet <remi@remirepo.net> - 9.2-4 - move config/config_path.php to inc/downstream.php - use /etc/glpi/local_define.php to allow local path change |