rpms/glpi-data-injection/F-10 glpi-data-injection.spec, 1.2, 1.3 sources, 1.3, 1.4 glpi-data-injection-1.2.patch, 1.1, NONE

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/glpi-data-injection/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30420

Modified Files:
	glpi-data-injection.spec sources 
Removed Files:
	glpi-data-injection-1.2.patch 
Log Message:
update to 1.4.0 (enhancement)


Index: glpi-data-injection.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi-data-injection/F-10/glpi-data-injection.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glpi-data-injection.spec	12 Jul 2008 07:47:34 -0000	1.2
+++ glpi-data-injection.spec	13 Mar 2009 14:36:11 -0000	1.3
@@ -1,7 +1,7 @@
 %define pluginname   data_injection
 
 Name:           glpi-data-injection
-Version:        1.2
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Plugin for importing data into GLPI
 Summary(fr):    Extension pour importer des données dans GLPI
@@ -12,12 +12,10 @@
 
 Source0:        http://www.glpi-project.org/IMG/gz/glpi-%{pluginname}-%{version}.tar.gz
 
-Patch0:         %{name}-1.2.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       glpi >= 0.71
+Requires:       glpi >= 0.71.5
 
 %description
 Plugin for importing data into GLPI
@@ -41,14 +39,17 @@
 %prep
 %setup -q -c
 
-pushd %{pluginname}
-%patch0 -p0
-popd
+mv %{pluginname}/test test
+mv %{pluginname}/docs docs
+mv %{pluginname}/changelog.txt docs/
 
 # dos2unix to avoid rpmlint warnings
-mv %{pluginname}/docs docs
-find %{pluginname} -name \*php -exec sed -i -e 's/\r//' {} \;
-find docs -type f -exec sed -i -e 's/\r//' {} \;
+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
 
 
 %build
@@ -74,11 +75,25 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc docs/*
-%{_datadir}/glpi/plugins/%{pluginname}
+%dir %{_datadir}/glpi/plugins/%{pluginname}
+%{_datadir}/glpi/plugins/%{pluginname}/*.php
 %dir %{_datadir}/glpi/plugins/%{pluginname}/locales
+%{_datadir}/glpi/plugins/%{pluginname}/ajax
+%{_datadir}/glpi/plugins/%{pluginname}/config
+%{_datadir}/glpi/plugins/%{pluginname}/css
+%{_datadir}/glpi/plugins/%{pluginname}/fonts
+%{_datadir}/glpi/plugins/%{pluginname}/front
+%{_datadir}/glpi/plugins/%{pluginname}/inc
+%{_datadir}/glpi/plugins/%{pluginname}/javascript
+%{_datadir}/glpi/plugins/%{pluginname}/pics
+
 
 
 %changelog
+* Fri Mar 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.4.0-1
+- update to 1.4.0
+- spec cleanup
+
 * 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-data-injection/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jul 2008 07:47:34 -0000	1.3
+++ sources	13 Mar 2009 14:36:11 -0000	1.4
@@ -1 +1 @@
-697b7e035d3a50a8e1bb4cfa3c6ae267  glpi-data_injection-1.2.tar.gz
+7d775dcc330574f3abf3fcebd0603a7d  glpi-data_injection-1.4.0.tar.gz


--- glpi-data-injection-1.2.patch DELETED ---