diff options
| -rw-r--r-- | glpi-webservices-dev.spec | 29 | ||||
| -rw-r--r-- | glpi-webservices.spec | 40 |
2 files changed, 49 insertions, 20 deletions
diff --git a/glpi-webservices-dev.spec b/glpi-webservices-dev.spec index be6c3b2..953a7b6 100644 --- a/glpi-webservices-dev.spec +++ b/glpi-webservices-dev.spec @@ -2,7 +2,7 @@ #global svnrelease 322 Name: glpi-webservices -Version: 1.3.1 +Version: 1.4.0 %if 0%{?svnrelease} Release: 0.1.svn%{svnrelease}%{?dist} %else @@ -20,16 +20,17 @@ URL: https://forge.indepnet.net/projects/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/1205/glpi-webservices-1.3.1.tar.gz +Source0: https://forge.indepnet.net/attachments/download/1623/glpi_webservices-1.4.0.tar.gz %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.83.3 -Requires: glpi < 0.84 -Requires: php-xmlrpc php-soap +Requires: glpi >= 0.84 +Requires: glpi < 0.85 +Requires: php-xmlrpc +Requires: php-soap %description This plugin provides a server for Web Services which allow @@ -43,6 +44,14 @@ Cette extension fournit un serveur de services web permettant %prep %setup -q -c +rm -rf %{pluginname}/tools \ + %{pluginname}/.htaccess \ + %{pluginname}/scripts/.htaccess +mv %{pluginname}/AUTHORS.txt . + +# Create link to LICENSE for standard doc folder +ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE + cat >httpd <<EOF <Directory /usr/share/glpi/plugins/%{pluginname}/scripts> <IfModule mod_authz_core.c> @@ -73,8 +82,6 @@ mkdir -p %{buildroot}/%{_datadir}/glpi/plugins cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname} # ===== apache ===== -rm -f %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/.htaccess -rm -f %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/.htaccess mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ install --mode 644 httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf @@ -84,12 +91,16 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc %{pluginname}/LICENSE +%doc LICENSE AUTHORS.txt %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %{_datadir}/glpi/plugins/%{pluginname} %changelog +* Wed Nov 13 2013 Remi Collet <Fedora@FamilleCollet.com> - 1.4.0-1 +- version 1.4.0 for GLPI 0.84 + https://forge.indepnet.net/projects/webservices/versions/921 + * 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 @@ -111,7 +122,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 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 |