rpms/mythes-nl/devel mythes-nl.spec,1.4,1.5

[Caolan McNamara]

Author: caolanm

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

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


Index: mythes-nl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-nl/devel/mythes-nl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mythes-nl.spec	8 Jul 2009 09:52:52 -0000	1.4
+++ mythes-nl.spec	11 Jul 2009 14:30:33 -0000	1.5
@@ -2,7 +2,7 @@ Name: mythes-nl
 Summary: Dutch thesaurus
 %define upstreamid 20090708
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.opentaal.org/opentaalbank/thesaurus/download/thes_nl_v2.zip
 Group: Applications/Text
 URL: http://www.opentaal.org/opentaalbank/thesaurus
@@ -17,9 +17,16 @@ Dutch thesaurus.
 %setup -q -c
 
 %build
-iconv -f ISO-8859-1 -t UTF-8 README_th_nl_v2.txt > README_th_nl_v2.txt.new
-touch -r README_th_nl_v2.txt README_th_nl_v2.txt.new
-mv -f README_th_nl_v2.txt.new README_th_nl_v2.txt
+for i in README_th_nl_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 +51,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