rpms/mythes-fr/devel mythes-fr.spec,1.3,1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-fr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18187

Modified Files:
	mythes-fr.spec 
Log Message:
tidy spec


Index: mythes-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-fr/devel/mythes-fr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mythes-fr.spec	23 May 2009 16:31:52 -0000	1.3
+++ mythes-fr.spec	13 Jul 2009 15:30:34 -0000	1.4
@@ -1,7 +1,7 @@
 Name: mythes-fr
 Summary: French thesaurus
 Version: 2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://download.tuxfamily.org/dicollecte2/thesaurus_2-1.zip
 Group: Applications/Text
 URL: http://dicollecte.tuxfamily.org/home.php?prj=fr
@@ -16,8 +16,16 @@ French thesaurus.
 %setup -q -c
 
 %build
-iconv -f ISO-8859-1 -t UTF-8 README_th_fr_FR_v2.txt > README_th_fr_FR_v2.txt.new
-mv -f README_th_fr_FR_v2.txt.new README_th_fr_FR_v2.txt
+for i in README_th_fr_FR_v2.txt; do
+  if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
+    iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
+    touch -r $i $i.new
+    mv -f $i.new $i
+  fi
+  tr -d '\r' < $i > $i.new
+  touch -r $i $i.new
+  mv -f $i.new $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -34,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Mon Jul 13 2009 Caolan McNamara <caolanm at redhat.com> - 2.1-4
+- tidy spec
+
 * Sat May 23 2009 Caolan McNamara <caolanm at redhat.com> - 2.1-3
 - update to new location