rpms/hunspell-is/devel hunspell-is.spec,1.3,1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-is/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4804

Modified Files:
	hunspell-is.spec 
Log Message:
tidy spec


Index: hunspell-is.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-is/devel/hunspell-is.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hunspell-is.spec	25 Feb 2009 04:59:56 -0000	1.3
+++ hunspell-is.spec	11 Jul 2009 15:00:07 -0000	1.4
@@ -2,7 +2,7 @@ Name: hunspell-is
 Summary: Icelandic hunspell dictionaries
 %define upstreamid 20060928
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://hunspell.sourceforge.net/is_IS.zip
 Group: Applications/Text
 URL: http://wiki.services.openoffice.org/wiki/Dictionaries#Icelandic_.28Iceland.29
@@ -20,8 +20,16 @@ Icelandic hunspell dictionaries.
 
 %build
 chmod -x *
-iconv -f ISO-8859-1 -t UTF-8 README_is_IS.txt > README_is_IS.txt.new
-mv -f README_is_IS.txt.new README_is_IS.txt
+for i in README_is_IS.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
@@ -37,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Sat Jul 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20060928-4
+- tidy spec
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20060928-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild