rpms/mythes-es/devel mythes-es.spec,1.6,1.7

[Caolan McNamara]

Author: caolanm

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

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


Index: mythes-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-es/devel/mythes-es.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mythes-es.spec	8 Jul 2009 09:50:17 -0000	1.6
+++ mythes-es.spec	11 Jul 2009 14:27:51 -0000	1.7
@@ -2,7 +2,7 @@ Name: mythes-es
 Summary: Spanish thesaurus
 %define upstreamid 20090708
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://openthes-es.berlios.de/download/OOo2-thes_es_ES.tar.bz2
 Group: Applications/Text
 URL: http://openthes-es.berlios.de
@@ -17,8 +17,16 @@ Spanish thesaurus.
 %setup -q -c
 
 %build
-iconv -f ISO-8859-1 -t UTF-8 README_th_es_ES_v2.txt > README_th_es_ES_v2.txt.new
-mv -f README_th_es_ES_v2.txt.new README_th_es_ES_v2.txt
+for i in README_th_es_ES_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
@@ -43,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythes/*
 
 %changelog
+* Sat Jul 11 2009 Caolán McNamara <caolanm at redhat.com> - 0.20090708-2
+- tidy spec
+
 * Wed Jul 08 2009 Caolán McNamara <caolanm at redhat.com> - 0.20090708-1
 - latest version