rpms/hunspell-cy/devel hunspell-cy.spec,1.4,1.5

[Caolan McNamara]

Author: caolanm

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

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


Index: hunspell-cy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-cy/devel/hunspell-cy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hunspell-cy.spec	25 Feb 2009 04:34:06 -0000	1.4
+++ hunspell-cy.spec	11 Jul 2009 15:14:51 -0000	1.5
@@ -2,10 +2,10 @@ Name: hunspell-cy
 Summary: Welsh hunspell dictionaries
 %define upstreamid 20040425
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://www.e-gymraeg.co.uk/myspell/myspell.zip
 Group: Applications/Text
-URL: http://www.e-gymraeg.co.uk/myspell
+URL: http://www.e-gymraeg.co.uk/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL+
 BuildArch: noarch
@@ -22,8 +22,16 @@ Welsh hunspell dictionaries.
 unzip PackWelsh.zip
 unzip cy_GB.zip
 chmod -x *
-tr -d '\r' < README_cy_GB.txt > README_cy_GB.txt.new
-mv -f README_cy_GB.txt.new README_cy_GB.txt
+for i in README_cy_GB.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
@@ -39,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Sat Jul 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20040425-4
+- tidy spec
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20040425-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild