rpms/hyphen-sv/devel hyphen-sv.spec,1.3,1.4

[Caolan McNamara]

Author: caolanm

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

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


Index: hyphen-sv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-sv/devel/hyphen-sv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hyphen-sv.spec	25 Feb 2009 06:20:48 -0000	1.3
+++ hyphen-sv.spec	11 Jul 2009 15:25:43 -0000	1.4
@@ -1,7 +1,7 @@
 Name: hyphen-sv
 Summary: Swedish hyphenation rules
 Version: 1.00.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://extensions.services.openoffice.org/files/1966/4/hyph_sv_SE.oxt
 Group: Applications/Text
 URL: http://extensions.services.openoffice.org/node/1968
@@ -18,9 +18,16 @@ Swedish hyphenation rules.
 
 %build
 chmod -x *
-iconv -f ISO-8859-1 -t UTF-8 README_sv_SE.txt > README_sv_SE.txt.new
-touch -r README_sv_SE.txt README_sv_SE.txt.new
-mv -f README_sv_SE.txt.new README_sv_SE.txt
+for i in README_sv_SE.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 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Sat Jul 11 2009 Caolan McNamara <caolanm at redhat.com> - 1.00.1-3
+- tidy spec
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.00.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild