From a9be3c9902f8567cba0af0f2f2a4aee4925e9368 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 13 Nov 2013 15:58:42 +0100
Subject: glpi-webservices: 1.4.0

---
 glpi-webservices.spec | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

(limited to 'glpi-webservices.spec')

diff --git a/glpi-webservices.spec b/glpi-webservices.spec
index 5125826..6fd6f31 100644
--- a/glpi-webservices.spec
+++ b/glpi-webservices.spec
@@ -1,10 +1,10 @@
 %global pluginname   webservices
-#global svnrelease   290
+#global svnrelease   322
 
 Name:           glpi-webservices
-Version:        1.2.0
+Version:        1.3.1
 %if 0%{?svnrelease}
-Release:        0.2.svn%{svnrelease}%{?dist}
+Release:        0.1.svn%{svnrelease}%{?dist}
 %else
 Release:        1%{?dist}
 %endif
@@ -16,19 +16,19 @@ License:        GPLv2+
 URL:            https://forge.indepnet.net/projects/webservices
 
 %if 0%{?svnrelease}
-# svn export -r 290 https://forge.indepnet.net/svn/webservices/branches/1.2-bugfixes webservices
-# tar czf glpi-webservices-1.2.0-290.tar.gz webservices
+# svn export -r 322 https://forge.indepnet.net/svn/webservices/trunk webservices
+# tar czf glpi-webservices-1.3.0-322.tar.gz webservices
 Source0:        glpi-%{pluginname}-%{version}-%{svnrelease}.tar.gz
 %else
-Source0:        https://forge.indepnet.net/attachments/download/980/glpi-webservices-1.2.0.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1205/glpi-webservices-1.3.1.tar.gz
 %endif
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.80
-Requires:       glpi <  0.81
+Requires:       glpi >= 0.83.3
+Requires:       glpi <  0.84
 Requires:       php-xmlrpc php-soap
 
 %description
@@ -45,8 +45,13 @@ Cette extension fournit un serveur de services web permettant
 
 cat >httpd <<EOF
 <Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
-    Order Allow,Deny
-    Deny from all
+	<IfModule mod_authz_core.c>
+		Require all denied
+	</IfModule>
+	<IfModule !mod_authz_core.c>
+		Order Allow,Deny
+		Deny from all
+	</IfModule>
 </Directory>
 
 <Directory /usr/share/glpi/plugins/%{pluginname}>
@@ -79,11 +84,24 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%doc %{pluginname}/LICENSE
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/glpi/plugins/%{pluginname}
 
 
 %changelog
+* Thu Jul 12 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.3.1-1
+- version 1.3.1 for GLPI 0.83.3
+  https://forge.indepnet.net/projects/webservices/versions/703
+
+* Fri Apr 06 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.3.0-1
+- version 1.3.0
+  https://forge.indepnet.net/projects/webservices/versions/635
+- fix config for httpd 2.4
+
+* Sun Feb 26 2012 Remi Collet <Fedora@FamilleCollet.com> - 1.3.0-0.1.svn322
+- update to 1.3.0 for glpi 0.83 RC (svn snapshot)
+
 * Sun Oct 16 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-1
 - update to 1.2.0 finale version
 
@@ -93,7 +111,7 @@ rm -rf %{buildroot}
 * Tue Sep 20 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-0.2.svn282
 - new snapshot
 
-* Tue Jul 17 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-0.1.svn264
+* Sun Jul 17 2011 Remi Collet <Fedora@FamilleCollet.com> - 1.2.0-0.1.svn264
 - update to 1.2.0 for glpi 0.80 RC (svn snapshot)
 
 * Tue Oct 12 2010 Remi Collet <Fedora@FamilleCollet.com> - 1.0.0-1
-- 
cgit