From dd6e6eb746fbe0ee4b70e0b07f0ce04b72d6198d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Oct 2017 18:38:50 +0200 Subject: switch --- glpi-ocsinventoryng.spec | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'glpi-ocsinventoryng.spec') diff --git a/glpi-ocsinventoryng.spec b/glpi-ocsinventoryng.spec index 5680473..2f5ec5f 100644 --- a/glpi-ocsinventoryng.spec +++ b/glpi-ocsinventoryng.spec @@ -10,7 +10,7 @@ %global lockname ocsinventoryng.lock Name: glpi-ocsinventoryng -Version: 1.2.2 +Version: 1.3.2 Release: 1%{?dist} Summary: Plugin to synchronize GLPI with OCS Inventory NG @@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext -Requires: glpi >= 0.90 +Requires: glpi >= 9.1.1 Requires: glpi < 9.2 Requires: crontabs Requires: php-cli @@ -67,7 +67,7 @@ rm %{pluginname}/TOKNOW.txt rm %{pluginname}/ocsinventoryng.png # For Windows only -rm %{pluginname}/scripts/run.** +rm %{pluginname}/scripts/*.bat # Access retricted in apache config rm ocsinventoryng/scripts/.htaccess \ @@ -84,6 +84,9 @@ EOF find %{pluginname} -type f -exec chmod -x {} \; chmod +x %{pluginname}/scripts/*.sh +# Display compatibility check +grep version_compare %{pluginname}/setup.php + %build # Regenerate the locales @@ -153,6 +156,8 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php | %dir %{_datadir}/glpi/plugins/%{pluginname}/locales %{_datadir}/glpi/plugins/%{pluginname}/*.php %{_datadir}/glpi/plugins/%{pluginname}/ajax +%{_datadir}/glpi/plugins/%{pluginname}/css +%{_datadir}/glpi/plugins/%{pluginname}/files %{_datadir}/glpi/plugins/%{pluginname}/front %{_datadir}/glpi/plugins/%{pluginname}/inc %{_datadir}/glpi/plugins/%{pluginname}/install @@ -165,6 +170,20 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php | %changelog +* Mon Jan 16 2017 Remi Collet - 1.3.2-1 +- Update to 1.3.2 for GLPI 9.1.1 + +* Tue Nov 29 2016 Remi Collet - 1.3.1-1 +- Update to 1.3.1 for GLPI 9.1.1 + +* Tue Nov 29 2016 Remi Collet - 1.3.0-1 +- Update to 1.3.0 for GLPI 9.1.1 +- update script is broken + open https://github.com/pluginsGLPI/ocsinventoryng/issues/58 + +* Wed Sep 28 2016 Remi Collet - 1.2.3-1 +- Update to 1.2.3 for GLPI 9.1 + * Fri Sep 16 2016 Remi Collet - 1.2.2-1 - Update to 1.2.2 for GLPI 0.90 and 9.1 - sources from github -- cgit