OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Oct-2006 08:13:02
Branch: HEAD Handle: 2006100207130200
Added files:
openpkg-src/data-isocodes
data-isocodes.patch
Modified files:
openpkg-src/data-isocodes
data-isocodes.spec
Log:
fix generation of .txt files
Summary:
Revision Changes Path
1.1 +17 -0 openpkg-src/data-isocodes/data-isocodes.patch
1.6 +4 -2 openpkg-src/data-isocodes/data-isocodes.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/data-isocodes/data-isocodes.patch
============================================================================
$ cvs diff -u -r0 -r1.1 data-isocodes.patch
--- /dev/null 2006-10-02 08:12:35 +0200
+++ data-isocodes.patch 2006-10-02 08:13:02 +0200
@@ -0,0 +1,17 @@
+Index: iso_3166/iso3166tab.py
+--- iso_3166/iso3166tab.py.orig 2006-09-29 21:45:59 +0200
++++ iso_3166/iso3166tab.py 2006-10-02 08:11:28 +0200
+@@ -15,10 +15,12 @@
+ self.ofile = ofile
+
+ def startElement(self, name, attrs):
+- if name != 'iso_3166_entry':
++ if name != 'iso_3166_entry' and name != 'iso_3166_2_entry':
+ return
+ code = attrs.get('alpha_2_code', None)
+ if code == None:
++ code = attrs.get('code', None)
++ if code == None:
+ raise RunTimeError, "Bad file"
+ if type(code) == unicode:
+ code = code.encode('UTF-8')
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/data-isocodes/data-isocodes.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 data-isocodes.spec
--- openpkg-src/data-isocodes/data-isocodes.spec 2 Oct 2006 05:55:41
-0000 1.5
+++ openpkg-src/data-isocodes/data-isocodes.spec 2 Oct 2006 06:13:02
-0000 1.6
@@ -42,6 +42,7 @@
# list of sources
Source0:
http://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes_%{V_dist}.tar.gz
+Patch0: data-isocodes.patch
# build information
Prefix: %{l_prefix}
@@ -68,11 +69,12 @@
%prep
%setup -q -n iso-codes-%{V_subdir}
+ %patch -p0
%build
( cd iso_3166
- python iso3166tab.py <iso_3166.xml | LC_ALL=C sort >iso_3166.tab
- python iso3166tab.py <iso_3166_2/iso_3166_2.xml | LC_ALL=C sort
>iso_3166_2/iso_3166_2.tab
+ python iso3166tab.py iso_3166.xml | LC_ALL=C sort >iso_3166.tab
+ python iso3166tab.py iso_3166_2/iso_3166_2.xml | LC_ALL=C sort
>iso_3166_2/iso_3166_2.tab
) || exit $?
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
