glpi-ocsinventoryng: 1.0.2 - New Package

4 files changed, 215 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..91b0fd5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../common/Makefile
+
diff --git a/glpi-ocsinventoryng-httpd.conf b/glpi-ocsinventoryng-httpd.conf
new file mode 100644
index 0000000..1ffd374
--- /dev/null
+++ b/glpi-ocsinventoryng-httpd.conf
@@ -0,0 +1,10 @@
+<Directory /usr/share/glpi/plugins/ocsinventoryng/install/mysql>
+    Order Allow,Deny
+    Deny from all
+</Directory>
+
+<Directory /usr/share/glpi/plugins/ocsinventoryng/scripts>
+    Order Allow,Deny
+    Deny from all
+</Directory>
+
diff --git a/glpi-ocsinventoryng-lock.patch b/glpi-ocsinventoryng-lock.patch
new file mode 100644
index 0000000..ac3f491
--- /dev/null
+++ b/glpi-ocsinventoryng-lock.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000..9073062
--- /dev/null
+++ b/glpi-ocsinventoryng.spec
@@ -0,0 +1,168 @@
+# spec file for glpi-ocsinventoryng
+#
+# Copyright (c) 2013 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Please, preserve the changelog entries
+#
+%global pluginname   ocsinventoryng
+%global lockname     ocsinventoryng.lock
+
+Name:           glpi-ocsinventoryng
+Version:        1.0.2
+Release:        1%{?dist}
+Summary:        Plugin to synchronize GLPI with OCS Inventory NG
+
+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
+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
+
+Requires:       glpi >= 0.84
+Requires:       glpi <  0.85
+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
+
+%patch0 -p0
+
+mv %{pluginname}/docs docs
+
+# Create link to LICENSE for standard doc folder
+ln -s %{_datadir}/glpi/plugins/%{pluginname}/LICENSE docs/LICENSE
+
+# dos2unix to avoid rpmlint warnings
+for doc in docs/* ; do
+    sed -i -e 's/\r//' $doc
+done
+
+# For developer only
+rm -rf %{pluginname}/tools
+
+# For Windows only
+rm %{pluginname}/scripts/run.**
+
+# Access retricted in apache config
+rm ocsinventoryng/scripts/.htaccess \
+   ocsinventoryng/install/mysql/.htaccess
+
+cat <<EOF | tee cron
+# GLPI ocsinventoryng plugin
+# Synchronization only of OCS servers in "expert" mode
+# Must be enabled from the GLPI Control panel
+*/5 * * * * apache %{_datadir}/glpi/plugins/%{pluginname}/scripts/ocsng_fullsync.sh
+EOF
+
+# fix perms
+chmod +x %{pluginname}/scripts/*.sh
+chmod -x %{pluginname}/scripts/*.php
+
+
+%build
+# Regenerate the locales
+for po in %{pluginname}/locales/*.po
+do
+   msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
+done
+
+
+%install
+rm -rf %{buildroot} 
+
+# Plugin
+mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
+cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
+
+# Apache
+install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+
+# Locales
+for i in %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/locales/*
+do
+  lang=$(basename $i)
+  echo "%lang(${lang:0:2}) %{_datadir}/glpi/plugins/%{pluginname}/locales/${lang}"
+done | tee %{name}.lang
+
+# Cron
+install -p -D -m 644 cron %{buildroot}%{_sysconfdir}/cron.d/%{name}
+
+# Lock
+mkdir -p %{buildroot}%{_localstatedir}/lib/glpi/files/_lock
+touch %{buildroot}%{_localstatedir}/lib/glpi/files/_lock/%{lockname}
+
+
+%clean
+rm -rf %{buildroot} 
+
+
+%post
+# first install (not upgrade)
+if [ "$1" -eq "1" ]; then
+    install -o apache -g apache -m 644 /dev/null %{_localstatedir}/lib/glpi/files/_lock/%{lockname}
+fi
+
+
+%postun
+# uninstall (not upgrade)
+if [ "$1" -eq "0" -a -f %{_localstatedir}/lib/glpi/files/_lock/%{lockname} ]; then
+    rm %{_localstatedir}/lib/glpi/files/_lock/%{lockname}
+fi
+
+
+%check
+# Check consistency for the name of the lock file in sources
+grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/ocsng_fullsync.sh || exit 1
+grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php || exit 1
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc docs/*
+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%dir %{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}/locales
+%{_datadir}/glpi/plugins/%{pluginname}/*.php
+%{_datadir}/glpi/plugins/%{pluginname}/front
+%{_datadir}/glpi/plugins/%{pluginname}/inc
+%{_datadir}/glpi/plugins/%{pluginname}/install
+%{_datadir}/glpi/plugins/%{pluginname}/pics
+%{_datadir}/glpi/plugins/%{pluginname}/scripts
+# Keep here as required from interface
+%{_datadir}/glpi/plugins/%{pluginname}/LICENSE
+# flag file (empty) used to enable/disable the plugin in the interface (apache)
+%ghost %{_localstatedir}/lib/glpi/files/_lock/%{lockname}
+
+
+%changelog
+* Wed Oct  2 2013 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
+- Initial RPM (from glpi-mass-ocs-import.spec)