rpms/mythes-de/devel mythes-de.spec,1.23,1.24

[Caolan McNamara]

Author: caolanm

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

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


Index: mythes-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mythes-de.spec	8 Jul 2009 09:48:53 -0000	1.23
+++ mythes-de.spec	11 Jul 2009 14:25:07 -0000	1.24
@@ -2,7 +2,7 @@ Name: mythes-de
 Summary: German thesaurus
 %define upstreamid 20090708
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.openthesaurus.de/download/thes_de_DE_v2.zip
 Group: Applications/Text
 URL: http://www.openthesaurus.de
@@ -18,8 +18,16 @@ German thesaurus.
 %setup -q -c
 
 %build
-iconv -f ISO-8859-1 -t UTF-8 README_th_de_DE_v2.txt > README_th_de_DE_v2.txt.new
-mv -f README_th_de_DE_v2.txt.new README_th_de_DE_v2.txt
+for i in README_th_de_DE_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
@@ -44,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Sat Jul 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090708-2
+- tidy spec
+
 * Wed Jul 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090708-1
 - latest version