summaryrefslogtreecommitdiffstats
path: root/glpi-fusioninventory.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-12-18 12:22:29 +0100
committerRemi Collet <remi@remirepo.net>2017-12-18 12:22:29 +0100
commitdf2655ff58317ed80c2364becbaf6181ff1f046b (patch)
tree7288b8b8111cb16bb72b52a99b0aa86734b67843 /glpi-fusioninventory.spec
parent1cd3dc31453d596581bdceee6a3305240f75286c (diff)
fix apache configuration when mod_php is not used
Diffstat (limited to 'glpi-fusioninventory.spec')
-rw-r--r--glpi-fusioninventory.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/glpi-fusioninventory.spec b/glpi-fusioninventory.spec
index bbf28ee..9643ffd 100644
--- a/glpi-fusioninventory.spec
+++ b/glpi-fusioninventory.spec
@@ -17,7 +17,7 @@ Name: glpi-fusioninventory
# New version schema : 2.4.0 = 0.80+1.0 < 0.80+1.1 < 0.83+1.0
Epoch: 1
Version: %{glpi_min}.0.%{plug_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: FusionInventory Server embedded as a GLPI plugin
Summary(fr): Serveur FusionInventory en extension pour GLPI
@@ -27,6 +27,8 @@ URL: http://fusioninventory.org/
Source0: https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/%{gh_tag}/glpi-fusioninventory-%{glpi_version}.%{plug_version}.tar.bz2
Source1: %{name}-httpd.conf
+# Override PHP configuration for php-fpm
+Source2: %{name}-user.ini
BuildArch: noarch
@@ -78,6 +80,7 @@ mv %{pluginname}/PICTURES .
# .htaccess replaced by a httpd config file
rm %{pluginname}/install/mysql/.htaccess \
%{pluginname}/scripts/.htaccess
+cp %{SOURCE2} %{pluginname}/.user.ini
#Fix rpmlint warnings
chmod +x %{pluginname}/scripts/createSNMPWalks.php
@@ -140,11 +143,15 @@ done | tee %{name}.lang
%{_datadir}/glpi/plugins/%{pluginname}/pics
%{_datadir}/glpi/plugins/%{pluginname}/report
%{_datadir}/glpi/plugins/%{pluginname}/scripts
+%{_datadir}/glpi/plugins/%{pluginname}/.user.ini
# Data
%attr(750,apache,root) %{_localstatedir}/lib/glpi/files/_plugins/%{pluginname}
%changelog
+* Mon Dec 18 2017 Remi Collet <remi@fedoraproject.org> - 1:9.2.0.1.0-2
+- fix apache configuration when mod_php is not used
+
* Tue Sep 26 2017 Remi Collet <remi@fedoraproject.org> - 1:9.2.0.1.0-1
- update to 9.2+1.0