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

Caolan McNamara caolanm at fedoraproject.org
Fri Jul 10 15:54:57 UTC 2009


Author: caolanm

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

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


Index: hyphen-bg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-bg/devel/hyphen-bg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hyphen-bg.spec	25 Feb 2009 05:59:42 -0000	1.2
+++ hyphen-bg.spec	10 Jul 2009 15:54:26 -0000	1.3
@@ -1,7 +1,7 @@
 Name: hyphen-bg
 Summary: Bulgarian hyphenation rules
 Version: 4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://downloads.sourceforge.net/bgoffice/OOo-hyph-bg-%{version}.zip
 Group: Applications/Text
 URL: http://bgoffice.sourceforge.net/
@@ -18,10 +18,16 @@ Bulgarian hyphenation rules.
 %setup -q -n OOo-hyph-bg-%{version}
 
 %build
-tr -d '\r' < README > README.new
-iconv -f ISO-8859-2 -t UTF-8 README.new > README
-tr -d '\r' < COPYING > COPYING.new
-mv COPYING.new COPYING
+for i in README COPYING; do
+  if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
+    iconv -f ISO-8859-2 -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 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hyphen/*
 
 %changelog
+* Fri Jul 10 2009 Caolan McNamara <caolanm at redhat.com> - 4.1-3
+- tidy spec
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the scm-commits mailing list