summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-09-26 07:46:24 +0200
committerRemi Collet <remi@remirepo.net>2017-09-26 07:46:24 +0200
commit1cd3dc31453d596581bdceee6a3305240f75286c (patch)
tree62ec7dc1548d5c161c023917d413c0cf4cd4f09f
parentaf18c333461ad596ac36d0e80a5b9799dce4b8c8 (diff)
v9.2+1.0
-rw-r--r--.gitignore1
-rw-r--r--glpi-fusioninventory.spec20
2 files changed, 9 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index fc9aa8c..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
clog
package-*.xml
*.tgz
+*.tar.bz2
*.tar.gz
*.tar.xz
*.tar.xz.asc
diff --git a/glpi-fusioninventory.spec b/glpi-fusioninventory.spec
index 8ee18ac..bbf28ee 100644
--- a/glpi-fusioninventory.spec
+++ b/glpi-fusioninventory.spec
@@ -25,24 +25,27 @@ Group: Applications/Internet
License: AGPLv3+
URL: http://fusioninventory.org/
-Source0: https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/%{gh_tag}/fusioninventory-for-glpi_%{glpi_version}.%{plug_version}.tar.gz
+Source0: https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/%{gh_tag}/glpi-fusioninventory-%{glpi_version}.%{plug_version}.tar.bz2
Source1: %{name}-httpd.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
-# phpcompatinfo for version 0.84+3.1
+# phpcompatinfo for version 9.2+1.0
+Requires: php-simplexml
+Requires: php-ctype
Requires: php-date
Requires: php-fileinfo
+Requires: php-filter
Requires: php-hash
Requires: php-json
+Requires: php-libxml
Requires: php-mysqli
Requires: php-pcre
Requires: php-session
-Requires: php-simplexml
Requires: php-spl
+Requires: php-xml
Requires: php-zip
Requires: php-zlib
Requires: glpi >= %{glpi_min}
@@ -97,8 +100,6 @@ done
%install
-rm -rf %{buildroot}
-
# Plugin
mkdir -p %{buildroot}%{_localstatedir}/lib/glpi/files/_plugins/%{pluginname}
@@ -116,12 +117,7 @@ do
done | tee %{name}.lang
-%clean
-rm -rf %{buildroot}
-
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
# fusioninventory
%{!?_licensedir:%global license %%doc}
@@ -138,9 +134,9 @@ rm -rf %{buildroot}
%{_datadir}/glpi/plugins/%{pluginname}/css
%{_datadir}/glpi/plugins/%{pluginname}/front
%{_datadir}/glpi/plugins/%{pluginname}/inc
+%{_datadir}/glpi/plugins/%{pluginname}/install
%{_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