From 6eaf72971c240cb1cf25f4fa0dd8be12c5ca29c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Apr 2014 07:49:19 +0200 Subject: glpi-webservices: switch spec --- glpi-webservices-dev.spec | 152 ---------------------------------------------- glpi-webservices.spec | 30 ++++++--- 2 files changed, 22 insertions(+), 160 deletions(-) delete mode 100644 glpi-webservices-dev.spec diff --git a/glpi-webservices-dev.spec b/glpi-webservices-dev.spec deleted file mode 100644 index 2e3da14..0000000 --- a/glpi-webservices-dev.spec +++ /dev/null @@ -1,152 +0,0 @@ -%global pluginname webservices -#global svnrelease 322 - -Name: glpi-webservices -Version: 1.4.1 -%if 0%{?svnrelease} -Release: 0.1.svn%{svnrelease}%{?dist} -%else -Release: 1%{?dist} -%endif -Summary: GLPI Plugin which provides web services -Summary(fr): Extension GLPI fournissant des services web - -Group: Applications/Internet -License: GPLv2+ -URL: https://forge.indepnet.net/projects/webservices - -%if 0%{?svnrelease} -# 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/1664/glpi_webservices-1.4.1.tar.gz -%endif - - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch - -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 -an external application to check and control GLPI. - -%description -l fr -Cette extension fournit un serveur de services web permettant -à une application externe d'interroger et de piloter GLPI. - - -%prep -%setup -q -c - -rm -rf %{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 < - - Require all denied - - - Order Allow,Deny - Deny from all - - - - - - # Uncomment next line to enable compression and reduce network load - #php_value zlib.output_compression 4096 - - -EOF - - -%build -# empty build - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}/%{_datadir}/glpi/plugins -cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname} - -# ===== apache ===== -mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ -install --mode 644 httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf - - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%doc LICENSE AUTHORS.txt -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%{_datadir}/glpi/plugins/%{pluginname} - - -%changelog -* Wed Feb 12 2014 Remi Collet - 1.4.1-1 -- version 1.4.1 - https://forge.indepnet.net/projects/webservices/versions/996 - -* Wed Nov 13 2013 Remi Collet - 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 - 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 - 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 - 1.3.0-0.1.svn322 -- update to 1.3.0 for glpi 0.83 RC (svn snapshot) - -* Sun Oct 16 2011 Remi Collet - 1.2.0-1 -- update to 1.2.0 finale version - -* Tue Sep 27 2011 Remi Collet - 1.2.0-0.2.svn290 -- new snapshot - -* Tue Sep 20 2011 Remi Collet - 1.2.0-0.2.svn282 -- new snapshot - -* Sun Jul 17 2011 Remi Collet - 1.2.0-0.1.svn264 -- update to 1.2.0 for glpi 0.80 RC (svn snapshot) - -* Tue Oct 12 2010 Remi Collet - 1.0.0-1 -- version 1.0.0 and GLPI 0.78 released - -* Wed Aug 25 2010 Remi Collet - 1.0.0-0.1.svn176 -- new snapshot - -* Tue Aug 10 2010 Remi Collet - 1.0.0-0.1.svn174 -- new snapshot - -* Wed Jul 07 2010 Remi Collet - 1.0.0-0.1.svn173 -- new snapshot - -* Fri Jul 02 2010 Remi Collet - 1.0.0-0.1.svn172 -- new snapshot - -* Sun Jun 20 2010 Remi Collet - 1.0.0-0.1.svn170 -- new snapshot - -* Fri Jun 18 2010 Remi Collet - 1.0.0-0.1.svn168 -- version 1.0.0 for glpi 0.78 RC (svn snapshot) -- initial RPM - diff --git a/glpi-webservices.spec b/glpi-webservices.spec index 6fd6f31..2e3da14 100644 --- a/glpi-webservices.spec +++ b/glpi-webservices.spec @@ -2,7 +2,7 @@ #global svnrelease 322 Name: glpi-webservices -Version: 1.3.1 +Version: 1.4.1 %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/1664/glpi_webservices-1.4.1.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,13 @@ Cette extension fournit un serveur de services web permettant %prep %setup -q -c +rm -rf %{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 < @@ -73,8 +81,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 +90,20 @@ 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 Feb 12 2014 Remi Collet - 1.4.1-1 +- version 1.4.1 + https://forge.indepnet.net/projects/webservices/versions/996 + +* Wed Nov 13 2013 Remi Collet - 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 - 1.3.1-1 - version 1.3.1 for GLPI 0.83.3 https://forge.indepnet.net/projects/webservices/versions/703 -- cgit