From 58723cd9b7947d48a2bc23d5110d7375f7a9c7c3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Oct 2015 07:02:28 +0200 Subject: glpi-fusioninventory: 0.85+1.3 --- glpi-fusioninventory.spec | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'glpi-fusioninventory.spec') diff --git a/glpi-fusioninventory.spec b/glpi-fusioninventory.spec index 6e1c3aa..348282b 100644 --- a/glpi-fusioninventory.spec +++ b/glpi-fusioninventory.spec @@ -7,8 +7,9 @@ # Please, preserve the changelog entries # %global pluginname fusioninventory -%global glpi_version 0.84.0 -%global plug_version 3.5 +%global glpi_version 0.85.0 +%global glpi_max 0.86 +%global plug_version 1.3 Name: glpi-fusioninventory # New version schema : 2.4.0 = 0.80+1.0 < 0.80+1.1 < 0.83+1.0 @@ -22,7 +23,7 @@ Group: Applications/Internet License: AGPLv3+ URL: http://forge.fusioninventory.org/projects/fusioninventory-for-glpi -Source0: http://forge.fusioninventory.org/attachments/download/1665/fusioninventory-for-glpi_0.84+3.5.tar.gz +Source0: http://forge.fusioninventory.org/attachments/download/1893/fusioninventory-for-glpi_0.85+1.3.tar.gz Source1: %{name}-httpd.conf @@ -43,8 +44,7 @@ Requires: php-spl Requires: php-zip Requires: php-zlib Requires: glpi >= %{glpi_version} -Requires: glpi < 0.85 -Requires: glpi-reports +Requires: glpi < %{glpi_max} %description @@ -68,6 +68,7 @@ done # Create link to LICENSE for standard doc folder ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE mv %{pluginname}/README.asciidoc docs/ +mv %{pluginname}/PICTURES . # .htaccess replaced by a httpd config file rm %{pluginname}/install/mysql/.htaccess \ @@ -109,7 +110,7 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf # fusioninventory %{!?_licensedir:%global license %%doc} -%license LICENSE +%license LICENSE PICTURES %doc docs/* %dir %{_datadir}/glpi/plugins/%{pluginname} %dir %{_datadir}/glpi/plugins/%{pluginname}/locales @@ -122,15 +123,35 @@ rm -rf %{buildroot} %{_datadir}/glpi/plugins/%{pluginname}/css %{_datadir}/glpi/plugins/%{pluginname}/front %{_datadir}/glpi/plugins/%{pluginname}/inc +%{_datadir}/glpi/plugins/%{pluginname}/js %{_datadir}/glpi/plugins/%{pluginname}/lib %{_datadir}/glpi/plugins/%{pluginname}/install %{_datadir}/glpi/plugins/%{pluginname}/pics %{_datadir}/glpi/plugins/%{pluginname}/report %{_datadir}/glpi/plugins/%{pluginname}/scripts -%{_datadir}/glpi/plugins/%{pluginname}/snmpmodels %changelog +* Tue Oct 6 2015 Remi Collet - 1:0.85.0.1.3-1 +- update to 0.85+1.3 for GLPI 0.85 + http://forge.fusioninventory.org/versions/217 + +* Sat Jul 25 2015 Remi Collet - 1:0.85.0.1.2-1 +- update to 0.85+1.2 for GLPI 0.85 + http://forge.fusioninventory.org/versions/213 + +* Sun Mar 1 2015 Remi Collet - 1:0.85.0.1.1-1 +- update to 0.85+1.1 for GLPI 0.85 + http://forge.fusioninventory.org/versions/208 + +* Tue Dec 23 2014 Remi Collet - 1:0.85.0.1.0-1 +- update to 0.85+1.0 for GLPI 0.85 + http://forge.fusioninventory.org/versions/97 + +* Wed Dec 17 2014 Remi Collet - 1:0.85.0.1.0-0.1.BETA1 +- update to 0.85+1.0-BETA1 for GLPI 0.85 + http://forge.fusioninventory.org/versions/97 + * Mon Oct 27 2014 Remi Collet - 1:0.84.0.3.5-1 - update to 0.84+3.5 for GLPI 0.84 http://forge.fusioninventory.org/versions/204 -- cgit