[glpi-mass-ocs-import/el5] update to 1.6.1

[Remi Collet]

commit 2616aa4a3bf68b89a3ebd8f4ecbac41bdad4d044
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Dec 12 14:00:29 2012 +0100

    update to 1.6.1

 .gitignore                |    3 +++
 glpi-mass-ocs-import.spec |   36 +++++++++++++++++++++++++++---------
 sources                   |    2 +-
 3 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5b83cb..b7b7dd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 *~
 glpi-massocsimport-1.3.0.tar.gz
 /glpi-massocsimport-1.4.2.tar.gz
+/glpi-massocsimport-1.5.2.tar.gz
+/glpi-massocsimport-1.6.0.tar.gz
+/glpi-massocsimport-1.6.1.tar.gz
diff --git a/glpi-mass-ocs-import.spec b/glpi-mass-ocs-import.spec
index daa9230..79314aa 100644
--- a/glpi-mass-ocs-import.spec
+++ b/glpi-mass-ocs-import.spec
@@ -2,8 +2,8 @@
 %global lockname     massocsimport.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.4.2
-Release:        1%{?dist}
+Version:        1.6.1
+Release:        3%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
 
@@ -11,18 +11,19 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            https://forge.indepnet.net/projects/massocsimport
 
-Source0:        https://forge.indepnet.net/attachments/download/898/glpi-massocsimport-1.4.2.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1211/glpi-massocsimport-1.6.1.tar.gz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.78
+Requires:       glpi >= 0.83.3
+Conflicts:      glpi >= 0.84
 Requires:       php-cli
 Requires:       %{_sysconfdir}/cron.d
 
-# This plugin is going to be renamed (for 0.72)
-Provides:       glpi-massocsimport = %{version}-%{release}
+# This plugin have been renamed
+Provides:       glpi-%{pluginname} = %{version}-%{release}
 
 
 %description
@@ -56,8 +57,13 @@ EOF
 
 cat >%{name}.httpd <<EOF
 <Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
-    Order Allow,Deny
-    Deny from all
+	<IfModule mod_authz_core.c>
+		Require all denied
+	</IfModule>
+	<IfModule !mod_authz_core.c>
+		Order Allow,Deny
+		Deny from all
+	</IfModule>
 </Directory>
 EOF
 
@@ -119,7 +125,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README-RPM-POSTINTALL.txt docs/*
+%doc README-RPM-POSTINTALL.txt docs/* %{pluginname}/LICENSE
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/glpi/plugins/%{pluginname}
@@ -128,6 +134,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 12 2012 Remi Collet <Fedora at FamilleCollet.com> - 1.6.1-3
+- fix GLPI version requirement
+
+- version 1.6.1 for GLPI 0.83.3
+  https://forge.indepnet.net/projects/massocsimport/versions/744
+
+- version 1.6.0 for GLPI 0.83
+  https://forge.indepnet.net/projects/massocsimport/versions/639
+- fix config for httpd 2.4
+
+- version 1.5.2 for GLPI 0.80
+
 * Sat Jun 11 2011 Remi Collet <Fedora at FamilleCollet.com> - 1.4.2-1
 - version 1.4.2 for GLPI 0.78
 
diff --git a/sources b/sources
index 45e6bce..94aa863 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f317c98eaedcbaacf7452a733dfd3ae2  glpi-massocsimport-1.4.2.tar.gz
+02a965cd502c07dd8838e4c26d33ee83  glpi-massocsimport-1.6.1.tar.gz