From 1d48fcb3eb6aff1b4d9a1837846d2193db2b5873 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Sep 2013 07:27:24 +0200 Subject: glpi-appliances: 1.9.0 for GLPI 0.84 --- glpi-appliances-dev.spec | 117 ----------------------------------------------- glpi-appliances.spec | 48 +++++++++++-------- 2 files changed, 29 insertions(+), 136 deletions(-) delete mode 100644 glpi-appliances-dev.spec diff --git a/glpi-appliances-dev.spec b/glpi-appliances-dev.spec deleted file mode 100644 index 46d41a1..0000000 --- a/glpi-appliances-dev.spec +++ /dev/null @@ -1,117 +0,0 @@ -%global pluginname appliances -#global svnrelease 184 - -Name: glpi-appliances -Version: 1.8.1 -%if 0%{?svnrelease} -Release: 0.1.svn%{svnrelease}%{?dist} -%else -Release: 1%{?dist} -%endif -Summary: GLPI Plugin to manage appliances -Summary(fr): Extension GLPI de gestion des applicatifs - -Group: Applications/Internet -License: GPLv2+ -URL: https://forge.indepnet.net/projects/appliances - -%if 0%{?svnrelease} -# svn export -r 184 https://forge.indepnet.net/svn/appliances/trunk appliances -# tar czf glpi-appliances-1.8.0-184.tar.gz appliances -Source0: glpi-%{pluginname}-%{version}-%{svnrelease}.tar.gz -%else -Source0: https://forge.indepnet.net/attachments/download/1214/glpi-appliances-1.8.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 - -%description -This plugin add appliances management to GLPI -* Appliances creation (composed by various inventory item) -* Direct management from items -* Integrated with Helpdesk - - -%description -l fr -Cette extension permet la gestion des applicatifs dans GLPI -* Création d’applicatifs composé de plusieurs items -* Gestion directe à partir de l’item -* Intégration avec l'assistance - - -%prep -%setup -q -c - -cat >httpd < - - Require all denied - - - Order Allow,Deny - Deny from all - - -EOF - - -%build -# empty build - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}/%{_datadir}/glpi/plugins -cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname} - -# ===== apache ===== -rm -f %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/sql/.htaccess -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 %{pluginname}/LICENSE -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%{_datadir}/glpi/plugins/%{pluginname} - - -%changelog -* Thu Jul 12 2012 Remi Collet - 1.8.1-1 -- version 1.8.1 for GLPI 0.83.3 - https://forge.indepnet.net/projects/appliances/versions/747 - -* Fri Apr 06 2012 Remi Collet - 1.8.0-1 -- version 1.8.0 - https://forge.indepnet.net/projects/appliances/versions/614 -- fix config for httpd 2.4 -- add 2 patches from SVN (php 5.4.0 + missing tab) - -* Sun Feb 26 2012 Remi Collet - 1.8.0-0.1.svn184 -- version 1.8.0 for glpi 0.83RC (svn snapshot) - -* Thu Jun 30 2011 Remi Collet - 1.7.0-1 -- version 1.7.0 released - -* Tue Jun 28 2011 Remi Collet - 1.7.0-0.1.svn136 -- version 1.7.0 for glpi 0.80 (svn snapshot) - -* Tue Oct 12 2010 Remi Collet - 1.6.0-1 -- version 1.6.0 and GLPI 0.78 released - -* Wed Aug 25 2010 Remi Collet - 1.6.0-0.1.svn114 -- new svn snapshot - -* Sun Jun 20 2010 Remi Collet - 1.6.0-0.1.svn110 -- version 1.6.0 for glpi 0.78 RC (svn snapshot) -- initial RPM - diff --git a/glpi-appliances.spec b/glpi-appliances.spec index 8f934b9..0017f3d 100644 --- a/glpi-appliances.spec +++ b/glpi-appliances.spec @@ -1,13 +1,8 @@ %global pluginname appliances -#global svnrelease 136 Name: glpi-appliances -Version: 1.7.0 -%if 0%{?svnrelease} -Release: 0.1.svn%{svnrelease}%{?dist} -%else +Version: 1.9.0 Release: 1%{?dist} -%endif Summary: GLPI Plugin to manage appliances Summary(fr): Extension GLPI de gestion des applicatifs @@ -15,21 +10,14 @@ Group: Applications/Internet License: GPLv2+ URL: https://forge.indepnet.net/projects/appliances -%if 0%{?svnrelease} -# svn export -r 136 https://forge.indepnet.net/svn/appliances/trunk appliances -# tar czf glpi-appliances-1.7.0-136.tar.gz appliances -Source0: glpi-%{pluginname}-%{version}-%{svnrelease}.tar.gz -%else -Source0: https://forge.indepnet.net/attachments/download/924/glpi-appliances-1.7.0.tar.gz -%endif - +Source0: https://forge.indepnet.net/attachments/download/1567/appliances-1.9.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: glpi >= 0.80 -Requires: glpi < 0.81 -Requires: php-xmlrpc php-soap +Requires: glpi >= 0.84 +Requires: glpi < 0.85 + %description This plugin add appliances management to GLPI @@ -50,8 +38,13 @@ Cette extension permet la gestion des applicatifs dans GLPI cat >httpd < - Order Allow,Deny - Deny from all + + Require all denied + + + Order Allow,Deny + Deny from all + EOF @@ -76,11 +69,28 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) +%doc %{pluginname}/LICENSE %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %{_datadir}/glpi/plugins/%{pluginname} %changelog +* Mon Sep 30 2013 Remi Collet - 1.9.0-1 +- version 1.9.0 for GLPI 0.84.2 + +* Thu Jul 12 2012 Remi Collet - 1.8.1-1 +- version 1.8.1 for GLPI 0.83.3 + https://forge.indepnet.net/projects/appliances/versions/747 + +* Fri Apr 06 2012 Remi Collet - 1.8.0-1 +- version 1.8.0 + https://forge.indepnet.net/projects/appliances/versions/614 +- fix config for httpd 2.4 +- add 2 patches from SVN (php 5.4.0 + missing tab) + +* Sun Feb 26 2012 Remi Collet - 1.8.0-0.1.svn184 +- version 1.8.0 for glpi 0.83RC (svn snapshot) + * Thu Jun 30 2011 Remi Collet - 1.7.0-1 - version 1.7.0 released -- cgit