[python-tablib] Fix broken setup.py.
Ralph Bean
ralph at fedoraproject.org
Fri Jul 6 20:16:35 UTC 2012
commit a4a352a78d7254099e07b284f4d0c9fff085de31
Author: Ralph Bean <rbean at redhat.com>
Date: Fri Jul 6 16:16:25 2012 -0400
Fix broken setup.py.
0001-Py3-support.patch | 2 +-
0002-Broken-setup.py.patch | 30 ++++++++++++++++++++++++++++++
python-tablib.spec | 7 ++++++-
3 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/0001-Py3-support.patch b/0001-Py3-support.patch
index f3c578c..998b8d4 100644
--- a/0001-Py3-support.patch
+++ b/0001-Py3-support.patch
@@ -1,7 +1,7 @@
From 8ed3bb621d123b13e434a198a90aa5b1d6452669 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean at redhat.com>
Date: Mon, 2 Jul 2012 12:47:20 -0400
-Subject: [PATCH] Py3-support.
+Subject: [PATCH 1/2] Py3-support.
---
tablib/packages/xlrd/__init__.py | 6 +++---
diff --git a/0002-Broken-setup.py.patch b/0002-Broken-setup.py.patch
new file mode 100644
index 0000000..6237960
--- /dev/null
+++ b/0002-Broken-setup.py.patch
@@ -0,0 +1,30 @@
+From 855d513ee6934a33f0b3f515e7ea2fbc65e33aef Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean at redhat.com>
+Date: Fri, 6 Jul 2012 16:14:09 -0400
+Subject: [PATCH 2/2] Broken-setup.py.
+
+---
+ setup.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index dc59038..469551c 100755
+--- a/setup.py
++++ b/setup.py
+@@ -46,8 +46,12 @@ setup(
+ author_email='me at kennethreitz.com',
+ url='http://python-tablib.org',
+ packages=[
+- 'tablib', 'tablib.formats',
++ 'tablib',
++ 'tablib.formats',
+ 'tablib.packages',
++ 'tablib.packages.omnijson',
++ 'tablib.packages.odf',
++ 'tablib.packages.xlrd',
+ 'tablib.packages.xlwt',
+ 'tablib.packages.openpyxl',
+ 'tablib.packages.openpyxl.shared',
+--
+1.7.10.4
+
diff --git a/python-tablib.spec b/python-tablib.spec
index 1d8a63a..61d2cfa 100644
--- a/python-tablib.spec
+++ b/python-tablib.spec
@@ -8,7 +8,7 @@
Name: python-tablib
Version: %{raw_version}.%{checkout}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Format agnostic tabular data library (XLS, JSON, YAML, CSV)
Group: Development/Libraries
@@ -17,6 +17,7 @@ URL: http://github.com/kennethreitz/tablib
Source0: %{modname}-%{version}.tar.gz
# https://github.com/kennethreitz/tablib/pull/68
Patch0: 0001-Py3-support.patch
+Patch1: 0002-Broken-setup.py.patch
BuildArch: noarch
@@ -65,6 +66,7 @@ Output formats supported:
%prep
%setup -q -n %{modname}
%patch0 -p1 -b .py3_support
+%patch1 -p1 -b .broken_setup_py
# Remove shebangs
for lib in $(find . -name "*.py"); do
@@ -129,6 +131,9 @@ popd
%changelog
+* Fri Jul 06 2012 Ralph Bean <rbean at redhat.com> - 0.9.11.20120702git752443f-4
+- Patch to fix broken setup.py
+
* Wed Jul 04 2012 Ralph Bean <rbean at redhat.com> - 0.9.11.20120702git752443f-3
- Removed shebangs.
More information about the scm-commits
mailing list