From a57aad8f5234945ee74657dffd50834378adc5cc Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 8 Sep 2014 10:40:37 +0200
Subject: glpi-ocsinventoryng: 1.0.3

---
 glpi-ocsinventoryng-lock.patch | 33 ---------------------------------
 glpi-ocsinventoryng.spec       | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 glpi-ocsinventoryng-lock.patch

diff --git a/glpi-ocsinventoryng-lock.patch b/glpi-ocsinventoryng-lock.patch
deleted file mode 100644
index ac3f491..0000000
--- a/glpi-ocsinventoryng-lock.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: trunk/scripts/ocsng_fullsync.sh
-===================================================================
---- ocsinventoryng/scripts/ocsng_fullsync.sh	(revision 331)
-+++ ocsinventoryng/scripts/ocsng_fullsync.sh	(revision 332)
-@@ -31,7 +31,7 @@
- 
- exit_if_soft_lock()
- {
--   if [ -f $GLPI_LOCK_DIR/ocsinventory.lock ]
-+   if [ -f $GLPI_LOCK_DIR/ocsinventoryng.lock ]
-    then
-       echo "Software lock : script can't run !"
-       exit 1
-Index: trunk/scripts/run.php
-===================================================================
---- ocsinventoryng/scripts/run.php	(revision 331)
-+++ ocsinventoryng/scripts/run.php	(revision 332)
-@@ -70,7 +70,7 @@
- 
- function exit_if_soft_lock() {
- 
--   if (file_exists(GLPI_LOCK_DIR."/massocsimport.lock")) {
-+   if (file_exists(GLPI_LOCK_DIR."/ocsinventoryng.lock")) {
-       echo "Software lock : script can't run !\n";
-       exit (1);
-    }
-@@ -204,4 +204,4 @@
- cleanup($pidfile);
- fwrite ($log, date("r") . " " . $_SERVER["argv"][0] . " ended\n\n");
- 
--?>
-\ No newline at end of file
-+?>
diff --git a/glpi-ocsinventoryng.spec b/glpi-ocsinventoryng.spec
index ac88f61..9f677ec 100644
--- a/glpi-ocsinventoryng.spec
+++ b/glpi-ocsinventoryng.spec
@@ -10,7 +10,7 @@
 %global lockname     ocsinventoryng.lock
 
 Name:           glpi-ocsinventoryng
-Version:        1.0.2
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Plugin to synchronize GLPI with OCS Inventory NG
 
@@ -18,12 +18,9 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            https://forge.indepnet.net/projects/ocsinventoryng
 
-Source0:        https://forge.indepnet.net/attachments/download/1564/glpi-ocsinventoryng-1.0.2.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1847/glpi-ocsinventoryng-1.0.3.tar.gz
 Source1:        %{name}-httpd.conf
 
-# https://forge.indepnet.net/projects/ocsinventoryng/repository/revisions/332
-Patch0:         %{name}-lock.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -53,8 +50,6 @@ plugin features to provide better compatibility and extensibility with OCS.
 %prep
 %setup -q -c
 
-%patch0 -p0
-
 mv %{pluginname}/docs docs
 
 # dos2unix to avoid rpmlint warnings
@@ -63,7 +58,7 @@ for doc in docs/* ; do
 done
 
 # Create link to LICENSE for standard doc folder
-ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE docs/LICENSE
+ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE LICENSE
 
 # For developer only
 rm -rf %{pluginname}/tools
@@ -146,6 +141,8 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php |
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
 %doc docs/*
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
@@ -164,5 +161,9 @@ grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php |
 
 
 %changelog
+* 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
+
 * Wed Oct  2 2013 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
-- Initial RPM (from glpi-mass-ocs-import.spec)
+- Initial RPM (from glpi-mass-ocs-import.spec)
\ No newline at end of file
-- 
cgit