[glpi-mass-ocs-import] version 1.6.0 for GLPI 0.83

[Remi Collet]

commit fee9168f2741c30f9afd88f51f5c161ef7e0c24e
Author: remi <fedora at famillecollet.com>
Date:   Thu Apr 19 14:51:18 2012 +0200

    version 1.6.0 for GLPI 0.83

 .gitignore                |    1 +
 glpi-mass-ocs-import.spec |   30 ++++++++++++++++++++----------
 sources                   |    2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed32e34..9fd5cd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 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
diff --git a/glpi-mass-ocs-import.spec b/glpi-mass-ocs-import.spec
index 7ca8484..4511ecb 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.5.2
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
 
@@ -11,19 +11,19 @@ Group:          Applications/Internet
 License:        GPLv2+
 URL:            https://forge.indepnet.net/projects/massocsimport
 
-Source0:        https://forge.indepnet.net/attachments/download/975/glpi-massocsimport-1.5.2.tar.gz
+Source0:        https://forge.indepnet.net/attachments/download/1132/glpi-massocsimport-1.6.0.tar.gz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.80.4
-Requires:       glpi <  0.81
+Requires:       glpi >= 0.83
+Requires:       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
@@ -57,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
 
@@ -120,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}
@@ -129,6 +134,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 19 2012 Remi Collet <Fedora at FamilleCollet.com> - 1.6.0-1
+- version 1.6.0 for GLPI 0.83
+  https://forge.indepnet.net/projects/massocsimport/versions/639
+- fix config for httpd 2.4
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 6f6a8ca..9b4f5d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af32fcfa35c15a4e945340ff139779aa  glpi-massocsimport-1.5.2.tar.gz
+1d16c9491cffeb81fd432f2d9e9026e1  glpi-massocsimport-1.6.0.tar.gz