glpi-ocsinventoryng: 1.2.0

3 files changed, 30 insertions, 47 deletions

diff --git a/glpi-ocsinventoryng-bug5359.patch b/glpi-ocsinventoryng-bug5359.patch
deleted file mode 100644
index 91edf24..0000000
--- a/glpi-ocsinventoryng-bug5359.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: trunk/front/config.form.php
-===================================================================
---- trunk/front/config.form.php	(révision 523)
-+++ trunk/front/config.form.php	(révision 524)
-@@ -47,7 +47,7 @@
- if ($plugin->isActivated("ocsinventoryng")) {
-    Html::header(__("Automatic synchronization's configuration", 'ocsinventoryng'), '', "tools", "pluginocsinventoryngmenu", "config");
- 
--   $config->showForm($_SERVER['PHP_SELF']);
-+   $config->display(array('id' => 1));
- } else {
-    Html::header(__('Setup'), '', "tools", "pluginocsinventoryngmenu", "config");
-    echo "<div class='center'><br><br>";
-Index: trunk/inc/config.class.php
-===================================================================
---- trunk/inc/config.class.php	(révision 523)
-+++ trunk/inc/config.class.php	(révision 524)
-@@ -41,7 +41,7 @@
-          switch ($item->getType()) {
-             case __CLASS__ :
-                //If connection to the OCS DB  is ok, and all rights are ok too
--               return array('1' => self::getTypeName());
-+               return array('1' => __('Check OCSNG import script', 'ocsinventoryng'));
- 
-          }
-       }
-@@ -65,6 +65,7 @@
- 
-       $ong = array();
-       $this->addDefaultFormTab($ong);
-+      $this->addStandardTab(__CLASS__, $ong, $options);
-       return $ong;
-    }
- 
diff --git a/glpi-ocsinventoryng-dev.spec b/glpi-ocsinventoryng-dev.spec
index d2ef6e9..e37ff91 100644
--- a/glpi-ocsinventoryng-dev.spec
+++ b/glpi-ocsinventoryng-dev.spec
@@ -10,23 +10,23 @@
 %global lockname     ocsinventoryng.lock
 
 Name:           glpi-ocsinventoryng
-Version:        1.1.2
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Plugin to synchronize GLPI with OCS Inventory NG
 
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            https://forge.indepnet.net/projects/ocsinventoryng
+URL:            https://forge.glpi-project.org/projects/ocsinventoryng
 
-Source0:        https://forge.glpi-project.org/attachments/download/2094/glpi-ocsinventoryng-1.1.2.tar.gz
+Source0:        https://forge.glpi-project.org/attachments/download/2105/glpi-ocsinventoryng-1.2.0.tar.gz
 Source1:        %{name}-httpd.conf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
 
-Requires:       glpi >= 0.85
-Requires:       glpi <  0.86
+Requires:       glpi >= 0.90
+Requires:       glpi <  0.91
 Requires:       crontabs
 Requires:       php-cli
 # phpcompatinfo for version 1.0.2
@@ -162,6 +162,10 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php |
 
 
 %changelog
+* Thu Oct  8 2015 Remi Collet <remi@fedoraproject.org> - 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 <remi@fedoraproject.org> - 1.1.2-1
 - Update to 1.1.2 for GLPI 0.85+
   https://forge.glpi-project.org/versions/1131
diff --git a/glpi-ocsinventoryng.spec b/glpi-ocsinventoryng.spec
index bcb3b93..d2ef6e9 100644
--- a/glpi-ocsinventoryng.spec
+++ b/glpi-ocsinventoryng.spec
@@ -1,4 +1,4 @@
-# spec file for glpi-ocsinventoryng
+# remirepo spec file for glpi-ocsinventoryng
 #
 # Copyright (c) 2013-2015 Remi Collet
 # License: CC-BY-SA
@@ -10,7 +10,7 @@
 %global lockname     ocsinventoryng.lock
 
 Name:           glpi-ocsinventoryng
-Version:        1.0.3
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Plugin to synchronize GLPI with OCS Inventory NG
 
@@ -18,15 +18,15 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            https://forge.indepnet.net/projects/ocsinventoryng
 
-Source0:        https://forge.indepnet.net/attachments/download/1847/glpi-ocsinventoryng-1.0.3.tar.gz
+Source0:        https://forge.glpi-project.org/attachments/download/2094/glpi-ocsinventoryng-1.1.2.tar.gz
 Source1:        %{name}-httpd.conf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
 
-Requires:       glpi >= 0.84
-Requires:       glpi <  0.85
+Requires:       glpi >= 0.85
+Requires:       glpi <  0.86
 Requires:       crontabs
 Requires:       php-cli
 # phpcompatinfo for version 1.0.2
@@ -55,6 +55,7 @@ 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
@@ -78,8 +79,8 @@ cat <<EOF | tee cron
 EOF
 
 # fix perms
+find %{pluginname} -type f -exec chmod -x {} \;
 chmod +x %{pluginname}/scripts/*.sh
-chmod -x %{pluginname}/scripts/*.php
 
 
 %build
@@ -91,7 +92,7 @@ done
 
 
 %install
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 # Plugin
 mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
@@ -116,7 +117,7 @@ touch %{buildroot}%{_localstatedir}/lib/glpi/files/_lock/%{lockname}
 
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 
 %post
@@ -161,6 +162,18 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php |
 
 
 %changelog
+* Wed Sep 16 2015 Remi Collet <remi@fedoraproject.org> - 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 <remi@fedoraproject.org> - 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 <remi@fedoraproject.org> - 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 <remi@fedoraproject.org> - 1.0.3-1
 - Update to 1.0.3 for GLPI 0.84+
   https://forge.indepnet.net/versions/957