rpms/glpi-mass-ocs-import/F-11 glpi-mass-ocs-import.spec, 1.6, 1.7 sources, 1.5, 1.6 glpi-mass-ocs-import.conf, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Wed Sep 9 15:51:44 UTC 2009
Author: remi
Update of /cvs/extras/rpms/glpi-mass-ocs-import/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16314
Modified Files:
glpi-mass-ocs-import.spec sources
Removed Files:
glpi-mass-ocs-import.conf
Log Message:
update to 1.3.0 for glpi 0.72
Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-11/glpi-mass-ocs-import.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- glpi-mass-ocs-import.spec 9 Apr 2009 15:18:45 -0000 1.6
+++ glpi-mass-ocs-import.spec 9 Sep 2009 15:51:44 -0000 1.7
@@ -1,8 +1,8 @@
-%define pluginname mass_ocs_import
-%define lockname mass_ocs_import.lock
+%define pluginname massocsimport
+%define lockname massocsimport.lock
Name: glpi-mass-ocs-import
-Version: 1.2.2
+Version: 1.3.0
Release: 1%{?dist}
Summary: GLPI Plugin for OCS Massive import
Summary(fr): Extension GLPI d'import en masse OCS
@@ -12,18 +12,13 @@ License: GPLv2+
URL: http://www.glpi-project.org/
Source0: http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
-Source1: %{name}.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: glpi >= 0.71.5
-%if 0%{?rhel} == 4
-Requires: php
-%else
+Requires: glpi >= 0.72
Requires: php-cli
-%endif
Requires: %{_sysconfdir}/cron.d
# This plugin is going to be renamed (for 0.72)
@@ -55,11 +50,15 @@ for fic in docs/*; do
done
cat >README-RPM-POSTINTALL.txt <<EOF
-
Remember to Install this extension in the Application.
-
Cron is provided, but disabled.
+EOF
+cat >%{name}.httpd <<EOF
+<Directory /usr/share/glpi/plugins/%{pluginname}/scripts>
+ Order Allow,Deny
+ Deny from all
+</Directory>
EOF
cat >cron <<EOF
@@ -91,7 +90,7 @@ touch %{buildroot}%{_localstatedir}/lib/
# ===== apache =====
rm %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/scripts/.htaccess
mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-install --mode 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install --mode 644 %{name}.httpd %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
%post
@@ -111,7 +110,7 @@ fi
%check
# Check 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}/config/plugin_mass_ocs_import.config.php || exit 1
+grep %{lockname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}/setup.php || exit 1
%clean
@@ -129,6 +128,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3.0-1
+- update to 1.3.0 finale for glpi 0.72
+
* Thu Apr 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
- update to 1.2.2 (bugfixes)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 9 Apr 2009 15:18:45 -0000 1.5
+++ sources 9 Sep 2009 15:51:44 -0000 1.6
@@ -1 +1 @@
-abe1e280079bdfcfe3ca0e567f241ba7 glpi-mass_ocs_import-1.2.2.tar.gz
+15f00aec2062ce5ca652abe89530a7cd glpi-massocsimport-1.3.0.tar.gz
--- glpi-mass-ocs-import.conf DELETED ---
More information about the fedora-extras-commits
mailing list