rpms/glpi-mass-ocs-import/devel .cvsignore, 1.3, 1.4 glpi-mass-ocs-import.spec, 1.3, 1.4 sources, 1.3, 1.4

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/glpi-mass-ocs-import/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9568

Modified Files:
	.cvsignore glpi-mass-ocs-import.spec sources 
Log Message:
update to 1.2.1 (bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jul 2008 08:35:40 -0000	1.3
+++ .cvsignore	3 Mar 2009 08:22:33 -0000	1.4
@@ -1 +1 @@
-glpi-mass_ocs_import-1.2.tar.gz
+glpi-mass_ocs_import-1.2.1.tar.gz


Index: glpi-mass-ocs-import.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/glpi-mass-ocs-import.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glpi-mass-ocs-import.spec	24 Feb 2009 22:15:46 -0000	1.3
+++ glpi-mass-ocs-import.spec	3 Mar 2009 08:22:33 -0000	1.4
@@ -2,8 +2,8 @@
 %define lockname     mass_ocs_import.lock
 
 Name:           glpi-mass-ocs-import
-Version:        1.2
-Release:        2%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        GLPI Plugin for OCS Massive import
 Summary(fr):    Extension GLPI d'import en masse OCS
 
@@ -18,9 +18,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71
+Requires:       glpi >= 0.71.5
 Requires:       %{_sysconfdir}/cron.d
 
+# This plugin is going to be renamed (for 0.72)
+Provides:       glpi-massocsimport = %{version}-%{release}
+
+
 %description
 Plugin which allow OCS continuous synchronization and massive importation.
 
@@ -36,7 +40,16 @@
 %prep
 %setup -q -c 
 
-cat >README.fedora <<EOF
+# fix wrong-file-end-of-line-encoding, preserving timestamp
+mv %{pluginname}/docs docs
+for fic in docs/*; do
+  mv $fic $fic.ref
+  sed -e 's/\r//' $fic.ref >$fic
+  touch -r $fic.ref $fic
+  rm $fic.ref
+done
+
+cat >README-RPM-POSTINTALL.txt <<EOF
 
 Remember to Install this extension in the Application.
 
@@ -56,7 +69,7 @@
 
 
 %install
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/%{_datadir}/glpi/plugins
 cp -ar %{pluginname} %{buildroot}/%{_datadir}/glpi/plugins/%{pluginname}
@@ -102,7 +115,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.fedora
+%doc README-RPM-POSTINTALL.txt docs/*
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/glpi/plugins/%{pluginname}
@@ -111,9 +124,17 @@
 
 
 %changelog
+* Tue Mar 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.2.1-1
+- update to 1.2.1 (bugfixes)
+- rename README.fedora to README-RPM-POSTINTALL.txt
+- add some docs
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Sun Sep 28 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1.el4.1
+- Fix MySQL 4.1 compatibility issue
+
 * Sat Jul 12 2008 Remi Collet <Fedora at FamilleCollet.com> - 1.2-1
 - update to 1.2 for glpi 0.71
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi-mass-ocs-import/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jul 2008 08:35:40 -0000	1.3
+++ sources	3 Mar 2009 08:22:33 -0000	1.4
@@ -1 +1 @@
-725e8b7c7d230fda2e049e3bef058d5c  glpi-mass_ocs_import-1.2.tar.gz
+76fdbe8592f6458c9accda669eb2e750  glpi-mass_ocs_import-1.2.1.tar.gz