rpms/hunspell-en/devel hunspell-en.spec,1.33,1.34

[Caolan McNamara]

Author: caolanm

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

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


Index: hunspell-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/hunspell-en.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- hunspell-en.spec	12 Jun 2009 14:16:09 -0000	1.33
+++ hunspell-en.spec	11 Jul 2009 15:15:26 -0000	1.34
@@ -2,7 +2,7 @@ Name: hunspell-en
 Summary: English hunspell dictionaries
 %define upstreamid 20090216
 Version: 0.%{upstreamid}
-Release: 4%{?dist}
+Release: 5%{?dist}
 #svn co https://wordlist.svn.sourceforge.net/svnroot/wordlist/trunk wordlist
 Source0: wordlist-%{upstreamid}.tar.bz2
 Source1: http://en-gb.pyxidium.co.uk/dictionary/en_GB.zip
@@ -34,8 +34,16 @@ English (US, UK, etc.) hunspell dictiona
 make
 cd scowl/speller
 make hunspell
-iconv -f ISO-8859-1 -t UTF-8 README_en_CA.txt > ../../README_en_CA.txt
-iconv -f ISO-8859-1 -t UTF-8 README_en_US.txt > ../../README_en_US.txt
+for i in README_en_CA.txt README_en_US.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
@@ -62,10 +70,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_en_GB.txt README_en_CA.txt README_en_US.txt
+%doc README_en_GB.txt scowl/speller/README_en_CA.txt scowl/speller/README_en_US.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Sat Jul 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090216-5
+- tidy spec
+
 * Fri Jun 12 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090216-4
 - extend coverage