packages: python-blockdiag/python-blockdiag.spec, python-blockdiag/orderedd...

[glen]

Author: glen                         Date: Sun Dec  4 19:55:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use collections.OrderedDict when available

---- Files affected:
packages/python-blockdiag:
   python-blockdiag.spec (1.23 -> 1.24) , ordereddict.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python-blockdiag/python-blockdiag.spec
diff -u packages/python-blockdiag/python-blockdiag.spec:1.23 packages/python-blockdiag/python-blockdiag.spec:1.24
--- packages/python-blockdiag/python-blockdiag.spec:1.23	Sun Dec  4 20:49:40 2011
+++ packages/python-blockdiag/python-blockdiag.spec	Sun Dec  4 20:54:55 2011
@@ -9,6 +9,7 @@
 URL:		http://blockdiag.com/en/blockdiag/index.html
 Source0:	http://pypi.python.org/packages/source/b/%{module}/%{module}-%{version}.tar.gz
 # Source0-md5:	50d4af3c9bbde576255ff3c9543ac60f
+Patch0:		ordereddict.patch
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	sed >= 4.0
 Requires:	python-PIL
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 %{__sed} -i -e 's/^from ez_setup/#from ez_setup/' setup.py
 %{__sed} -i -e 's/^use_setuptools()/#use_setuptools()/' setup.py
 
@@ -69,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/12/04 19:54:55  glen
+- use collections.OrderedDict when available
+
 Revision 1.23  2011/12/04 19:49:40  glen
 - ordereddict needed only for py<2.7 according to docs
 

================================================================
Index: packages/python-blockdiag/ordereddict.patch
diff -u /dev/null packages/python-blockdiag/ordereddict.patch:1.1
--- /dev/null	Sun Dec  4 20:55:00 2011
+++ packages/python-blockdiag/ordereddict.patch	Sun Dec  4 20:54:55 2011
@@ -0,0 +1,16 @@
+--- blockdiag-1.1.1/./src/blockdiag/utils/fontmap.py~	2011-11-19 18:33:54.000000000 +0200
++++ blockdiag-1.1.1/./src/blockdiag/utils/fontmap.py	2011-12-04 21:53:52.812019538 +0200
+@@ -18,7 +18,12 @@
+ import sys
+ import copy
+ import codecs
+-from ordereddict import OrderedDict
++try:
++    # py2.7
++    from collections import OrderedDict
++except ImportError:
++    # python-ordereddict
++    from ordereddict import OrderedDict
+ from ConfigParser import SafeConfigParser
+ from blockdiag.utils.collections import namedtuple
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-blockdiag/python-blockdiag.spec?r1=1.23&r2=1.24&f=u