From dd6e6eb746fbe0ee4b70e0b07f0ce04b72d6198d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Oct 2017 18:38:50 +0200 Subject: switch --- .gitignore | 8 ++ glpi-ocsinventoryng-dev.spec | 216 ------------------------------------------- glpi-ocsinventoryng.spec | 25 ++++- 3 files changed, 30 insertions(+), 219 deletions(-) create mode 100644 .gitignore delete mode 100644 glpi-ocsinventoryng-dev.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/glpi-ocsinventoryng-dev.spec b/glpi-ocsinventoryng-dev.spec deleted file mode 100644 index 2f5ec5f..0000000 --- a/glpi-ocsinventoryng-dev.spec +++ /dev/null @@ -1,216 +0,0 @@ -# remirepo spec file for glpi-ocsinventoryng -# -# Copyright (c) 2013-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%global pluginname ocsinventoryng -%global lockname ocsinventoryng.lock - -Name: glpi-ocsinventoryng -Version: 1.3.2 -Release: 1%{?dist} -Summary: Plugin to synchronize GLPI with OCS Inventory NG - -Group: Applications/Internet -License: GPLv2+ -URL: https://github.com/pluginsGLPI/ocsinventoryng - -Source0: https://github.com/pluginsGLPI/ocsinventoryng/releases/download/%{version}/glpi-ocsinventoryng-%{version}.tar.gz -Source1: %{name}-httpd.conf - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: gettext - -Requires: glpi >= 9.1.1 -Requires: glpi < 9.2 -Requires: crontabs -Requires: php-cli -# phpcompatinfo for version 1.0.2 -Requires: php-date -Requires: php-json -Requires: php-pcre - -# Latest version is 1.6.x for GLPI 0.83.x -Obsoletes: glpi-mass-ocs-import < 1.7 -Provides: glpi-mass-ocs-import = 1.7.0 -Provides: glpi-massocsimport = 1.7.0 - - -%description -This plugin allows you to synchronize GLPI inventory with OCS Inventory NG. - -It's intended to replace native mode OCS of GLPI and use the massocsimport -plugin features to provide better compatibility and extensibility with OCS. - - -%prep -%setup -q -c - -mv %{pluginname}/docs docs - -# dos2unix to avoid rpmlint warnings -for doc in docs/* ; do - sed -i -e 's/\r//' $doc - chmod -x $doc -done - -# Create link to LICENSE for standard doc folder -ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE - -# For developer only -rm %{pluginname}/README.md -rm %{pluginname}/TOKNOW.txt -rm %{pluginname}/ocsinventoryng.png - -# For Windows only -rm %{pluginname}/scripts/*.bat - -# Access retricted in apache config -rm ocsinventoryng/scripts/.htaccess \ - ocsinventoryng/install/mysql/.htaccess - -cat < - 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 - -* Fri Nov 27 2015 Remi Collet - 1.2.1-1 -- Update to 1.2.1 for GLPI 0.90 - https://forge.glpi-project.org/versions/1181 - -* Thu Oct 8 2015 Remi Collet - 1.2.0-1 -- Update to 1.2.0 for GLPI 0.90 - https://forge.glpi-project.org/versions/1179 - -* Wed Sep 16 2015 Remi Collet - 1.1.2-1 -- Update to 1.1.2 for GLPI 0.85+ - https://forge.glpi-project.org/versions/1131 - -* Mon Jun 8 2015 Remi Collet - 1.1.1-1 -- Update to 1.1.1 for GLPI 0.85+ -- add upstream patch for https://forge.indepnet.net/issues/5359 - -* Sun Mar 1 2015 Remi Collet - 1.1.0-1 -- Update to 1.1.0 for GLPI 0.85+ - https://forge.indepnet.net/versions/1116 - -* Mon Sep 8 2014 Remi Collet - 1.0.3-1 -- Update to 1.0.3 for GLPI 0.84+ - https://forge.indepnet.net/versions/957 - -* Wed Oct 2 2013 Remi Collet - 1.0.2-1 -- Initial RPM (from glpi-mass-ocs-import.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