rpms/hyphen-de/devel hyphen-de.spec,1.2,1.3

[Caolan McNamara]

Author: caolanm

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

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


Index: hyphen-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-de/devel/hyphen-de.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-de.spec	25 Feb 2009 06:02:38 -0000	1.2
+++ hyphen-de.spec	11 Jul 2009 15:59:01 -0000	1.3
@@ -2,7 +2,7 @@ Name: hyphen-de
 Summary: German hyphenation rules
 %define upstreamid 20060120
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_de_DE.zip
 Group: Applications/Text
 URL: http://wiki.services.openoffice.org/wiki/Dictionaries
@@ -18,8 +18,16 @@ German hyphenation rules.
 %setup -q -c -n hyphen-de
 
 %build
-iconv -f ISO-8859-1 -t UTF-8 README_hyph_de_DE.txt > README_hyph_de_DE.txt.new
-mv -f README_hyph_de_DE.txt.new README_hyph_de_DE.txt
+for i in README_hyph_de_DE.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
@@ -42,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Sat Jul 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20060120-4
+- tidy spec
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20060120-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild