From 2101092b0f6e867e03d2ca14caca01dd4a8f4ef6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Nov 2018 16:16:29 +0100 Subject: version 1.9.0 for GLPI 9.3 https://forge.glpi-project.org/versions/1268 --- changeset_r458.diff | 18 ------------------ glpi-webservices.spec | 17 +++++++++-------- 2 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 changeset_r458.diff diff --git a/changeset_r458.diff b/changeset_r458.diff deleted file mode 100644 index 13740e3..0000000 --- a/changeset_r458.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: trunk/inc/methodsession.class.php -=================================================================== ---- trunk/inc/methodsession.class.php (révision 457) -+++ trunk/inc/methodsession.class.php (révision 458) -@@ -339,12 +339,7 @@ - $current = session_id(); - $session = trim($session); - -- if (file_exists(GLPI_ROOT . "/config/config_path.php")) { -- include_once (GLPI_ROOT . "/config/config_path.php"); -- } -- if (!defined("GLPI_SESSION_DIR")) { -- define("GLPI_SESSION_DIR", GLPI_ROOT . "/files/_sessions"); -- } -+ require_once GLPI_ROOT . '/inc/based_config.php'; - - if ($session != $current) { - if (!empty($current)) { diff --git a/glpi-webservices.spec b/glpi-webservices.spec index 479fca7..9b95357 100644 --- a/glpi-webservices.spec +++ b/glpi-webservices.spec @@ -9,24 +9,22 @@ %global pluginname webservices Name: glpi-webservices -Version: 1.8.0 -Release: 3%{?dist} +Version: 1.9.0 +Release: 1%{?dist} Summary: GLPI Plugin which provides web services Summary(fr): Extension GLPI fournissant des services web License: GPLv2+ URL: https://forge.glpi-project.org/projects/webservices -Source0: https://forge.glpi-project.org/attachments/download/2248/glpi-webservices-1.8.0.tar.gz - -Patch0: changeset_r458.diff +Source0: https://forge.glpi-project.org/attachments/download/2263/glpi-webservices-1.9.0.tar.gz BuildArch: noarch %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (glpi >= 9.2 with glpi < 9.4) +Requires: (glpi >= 9.3 with glpi < 9.4) %else -Requires: glpi >= 9.2 +Requires: glpi >= 9.3 Requires: glpi < 9.4 %endif Requires: php-xmlrpc @@ -47,7 +45,6 @@ Cette extension fournit un serveur de services web permettant cd %{pluginname} grep version_compare setup.php -%patch0 -p1 rm -r .htaccess scripts/.htaccess cd .. @@ -96,6 +93,10 @@ install --mode 644 httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf %changelog +* Thu Nov 29 2018 Remi Collet - 1.9.0-1 +- version 1.9.0 for GLPI 9.3 + https://forge.glpi-project.org/versions/1268 + * Fri Jun 29 2018 Remi Collet - 1.8.0-3 - fix cannot retrieve GLPI configuration when personalized upstream from https://forge.glpi-project.org/issues/5565 -- cgit