[python-msgpack/el5] * fix build for EPEL5

topdog topdog at fedoraproject.org
Mon Aug 15 19:49:23 UTC 2011


commit 5d89363f383b0aaf21f6bff05799f11a4dc200b2
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Mon Aug 15 21:47:03 2011 +0200

     * fix build for EPEL5

 fix-build-on-py24.patch |   15 +++++++++++++++
 python-msgpack.spec     |   11 +++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/fix-build-on-py24.patch b/fix-build-on-py24.patch
new file mode 100644
index 0000000..9de9d8a
--- /dev/null
+++ b/fix-build-on-py24.patch
@@ -0,0 +1,15 @@
+diff -ruN msgpack-python-0.1.9.orig/setup.py msgpack-python-0.1.9/setup.py
+--- msgpack-python-0.1.9.orig/setup.py	2011-01-29 00:27:34.000000000 +0200
++++ msgpack-python-0.1.9/setup.py	2011-08-15 21:17:38.190815591 +0200
+@@ -45,7 +45,10 @@
+ 
+     Sdist = sdist
+ 
+-libraries = ['ws2_32'] if sys.platform == 'win32' else []
++if sys.platform == 'win32':
++    libraries = ['ws2_32']
++else:
++    libraries = [] 
+ 
+ msgpack_mod = Extension('msgpack._msgpack',
+                         sources=sources,
diff --git a/python-msgpack.spec b/python-msgpack.spec
index 0caa788..ac9981b 100644
--- a/python-msgpack.spec
+++ b/python-msgpack.spec
@@ -6,7 +6,7 @@
 
 Name:           python-%{srcname}
 Version:        0.1.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Python MessagePack (de)serializer
 
 Group:          Development/Languages
@@ -14,6 +14,7 @@ License:        ASL 2.0
 URL:            http://pypi.python.org/pypi/msgpack-python/
 Source0:        http://pypi.python.org/packages/source/m/%{srcname}-python/%{srcname}-python-%{version}.tar.gz
 Patch0:         msgpack-python-0.1.9-endian.patch
+Patch1:         fix-build-on-py24.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -37,6 +38,7 @@ This is a Python (de)serializer for MessagePack.
 %prep
 %setup -q -n %{srcname}-python-%{version}
 %patch0 -p1 -b .endian
+%patch1 -p1
 
 
 %build
@@ -60,10 +62,15 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{python_sitearch}/%{srcname}/
-%{python_sitearch}/%{srcname}*.egg-info
+#%{python_sitearch}/%{srcname}*.egg-info
 
 
 %changelog
+* Mon Aug 15 2011 Andrew Colin Kissa <andrew at topdog.za.net> -0.1.9-4
+- Fix build on python2.4
+- Fix build on RHEL5
+- Build for EPEL5
+
 * Tue Jul 12 2011 Dan Horák <dan[at]danny.cz> - 0.1.9-3
 - fix build on big endian arches
 


More information about the scm-commits mailing list