From 904b4e941f164da11a233f0825b4552bb089e89a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Jun 2018 14:09:59 +0200 Subject: fix cannot retrieve GLPI configuration when personalized upstream from https://forge.glpi-project.org/issues/5565 --- glpi-webservices.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'glpi-webservices.spec') diff --git a/glpi-webservices.spec b/glpi-webservices.spec index b60c0df..479fca7 100644 --- a/glpi-webservices.spec +++ b/glpi-webservices.spec @@ -10,7 +10,7 @@ Name: glpi-webservices Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GLPI Plugin which provides web services Summary(fr): Extension GLPI fournissant des services web @@ -19,6 +19,8 @@ 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 + BuildArch: noarch %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -43,10 +45,12 @@ Cette extension fournit un serveur de services web permettant %prep %setup -q -c -rm -rf %{pluginname}/.htaccess \ - %{pluginname}/scripts/.htaccess +cd %{pluginname} +grep version_compare setup.php +%patch0 -p1 -rm -rf %{pluginname}/tools +rm -r .htaccess scripts/.htaccess +cd .. # Create link to LICENSE for standard doc folder ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE @@ -92,6 +96,10 @@ install --mode 644 httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf %changelog +* 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 + * Tue Jun 12 2018 Remi Collet - 1.8.0-2 - allow GLPI 9.3 -- cgit