rpms/mythes-ga/devel mythes-ga.spec,1.5,1.6

[Caolan McNamara]

Author: caolanm

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

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


Index: mythes-ga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ga/devel/mythes-ga.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mythes-ga.spec	26 Feb 2009 03:53:27 -0000	1.5
+++ mythes-ga.spec	11 Jul 2009 15:37:16 -0000	1.6
@@ -2,7 +2,7 @@ Name: mythes-ga
 Summary: Irish thesaurus
 %define upstreamid 20071001
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/thes_ga_IE_v2.zip
 Group: Applications/Text
 URL: http://borel.slu.edu/lsg/index-en.html
@@ -18,8 +18,16 @@ Irish thesaurus.
 %setup -q -c
 
 %build
-iconv -f ISO-8859-1 -t UTF-8 README_th_ga_IE_v2.txt > README_th_ga_IE_v2.txt.new
-mv -f README_th_ga_IE_v2.txt.new README_th_ga_IE_v2.txt
+for i in README_th_ga_IE_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
@@ -36,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Sat Jul 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20071001-4
+- tidy spec
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20071001-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild