summaryrefslogtreecommitdiffstats
path: root/glpi-fusioninventory.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-01-15 19:45:23 +0100
committerRemi Collet <fedora@famillecollet.com>2014-01-15 19:45:23 +0100
commitcc1201c7d24f650e7ec976b787193253031a0458 (patch)
tree67ea3a1f1c9b82322825b2f5a7c04e7e99d7b178 /glpi-fusioninventory.spec
parentfee246acae83b3d5617fae26bdc756e7e4869203 (diff)
glpi-fusioninventory: 0.84+2.0
Diffstat (limited to 'glpi-fusioninventory.spec')
-rw-r--r--glpi-fusioninventory.spec20
1 files changed, 7 insertions, 13 deletions
diff --git a/glpi-fusioninventory.spec b/glpi-fusioninventory.spec
index 5293f59..7c7adca 100644
--- a/glpi-fusioninventory.spec
+++ b/glpi-fusioninventory.spec
@@ -8,7 +8,7 @@
#
%global pluginname fusioninventory
%global glpi_version 0.84.0
-%global plug_version 1.2
+%global plug_version 2.0
Name: glpi-fusioninventory
# New version schema : 2.4.0 = 0.80+1.0 < 0.80+1.1 < 0.83+1.0
@@ -22,15 +22,9 @@ Group: Applications/Internet
License: AGPLv3+
URL: http://forge.fusioninventory.org/projects/fusioninventory-for-glpi
-Source0: http://forge.fusioninventory.org/attachments/download/1084/fusioninventory-for-glpi_0.84+1.2.tar.gz
+Source0: http://forge.fusioninventory.org/attachments/download/1198/fusioninventory-for-glpi_0.84+2.0.tar.gz
Source1: %{name}-httpd.conf
-# http://forge.fusioninventory.org/issues/2259
-Patch0: %{pluginname}-install.patch
-
-# To be followed
-# http://forge.fusioninventory.org/issues/2271 mysql_real_escape_string
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -67,8 +61,6 @@ Serveur FusionInventory embarqué dans une extension GLPI.
%prep
%setup -q -c
-%patch0 -p0
-
mv %{pluginname}/docs docs
# dos2unix to avoid rpmlint warnings
@@ -82,8 +74,7 @@ mv %{pluginname}/README.asciidoc docs/
# .htaccess replaced by a httpd config file
rm %{pluginname}/install/mysql/.htaccess \
- %{pluginname}/scripts/.htaccess \
- %{pluginname}/tools/.htaccess
+ %{pluginname}/scripts/.htaccess
%build
@@ -137,11 +128,14 @@ rm -rf %{buildroot}
%{_datadir}/glpi/plugins/%{pluginname}/pics
%{_datadir}/glpi/plugins/%{pluginname}/report
%{_datadir}/glpi/plugins/%{pluginname}/scripts
-%{_datadir}/glpi/plugins/%{pluginname}/tools
%{_datadir}/glpi/plugins/%{pluginname}/snmpmodels
%changelog
+* Wed Jan 15 2014 Remi Collet <remi@fedoraproject.org> - 1:0.84.0.2.0-1
+- update to 0.84+2.0 for GLPI 0.84
+- set allow_url_fopen=On in config
+
* Fri Aug 03 2012 Remi Collet <remi@fedoraproject.org> - 1:0.84.0.1.2-1
- update to 0.84+1.2 for GLPI 0.84
- add explicit dependency on required extensions