[deltarpm] Turn Python 3 module building back on. The module still doesn't work, though

[Jonathan Dieter]

commit fe378dbd648e7328905521a178b825752c273cc0
Author: Jonathan Dieter <jdieter at lesbg.com>
Date:   Tue Jan 18 20:31:10 2011 +0200

    Turn Python 3 module building back on.  The module still doesn't work, though

 .gitignore                         |    1 +
 deltarpm-3.6-extra-verbosity.patch |   40 --------
 deltarpm-system-zlib.patch         |  185 ------------------------------------
 deltarpm.spec                      |   28 +++---
 sources                            |    2 +-
 5 files changed, 14 insertions(+), 242 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e7215c..36a2858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 deltarpm-git-20100708.tar.bz2
 /deltarpm-git-20101230.tar.bz2
+/deltarpm-git-20110118.tar.bz2
diff --git a/deltarpm.spec b/deltarpm.spec
index 6b13a53..a1037a1 100644
--- a/deltarpm.spec
+++ b/deltarpm.spec
@@ -1,27 +1,22 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Disabled at this suggestion:
-# http://lists.fedoraproject.org/pipermail/devel/2011-January/147920.html
-%if 0%{?fedora} > 15 || 0%{?rhel} > 5
+%if 0%{?fedora} > 12 || 0%{?rhel} > 5
 %global with_python3 1
 %endif
 
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.6
-Release: 0.3.20101230git%{?dist}
+Release: 0.4.20110118git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
 # Generate source by doing:
 # git clone git://gitorious.org/deltarpm/deltarpm
 # cd deltarpm
-# git archive --format=tar --prefix="deltarpm-git-20101230/" ad3bdf2f | \
-#   bzip2 > deltarpm-git-20101230.tar.bz2
-Source: %{name}-git-20101230.tar.bz2
-# Build with system zlib
-Patch0: deltarpm-system-zlib.patch
-Patch1: deltarpm-3.6-extra-verbosity.patch
+# git archive --format=tar --prefix="deltarpm-git-20110118/" b6d23d5d | \
+#   bzip2 > deltarpm-git-20110118.tar.bz2
+Source: %{name}-git-20110118.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
@@ -77,10 +72,7 @@ This package contains python bindings for deltarpm.
 
 
 %prep
-%setup -q -n %{name}-git-20101230
-# Build with system zlib
-%patch0 -p1 -b .zlib
-%patch1 -p1 -b .verbose
+%setup -q -n %{name}-git-20110118
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -93,12 +85,12 @@ This package contains python bindings for deltarpm.
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%makeinstall pylibprefix=%{buildroot}
 
 %if 0%{?with_python3}
 # nothing to do
 %else
-rm -rf %{buildroot}%{_libdir}/python3.2*
+rm -rf %{buildroot}%{_libdir}/python3*
 %endif
 
 
@@ -146,6 +138,10 @@ rm -rf %{buildroot}%{_libdir}/python3.2*
 %endif
 
 %changelog
+* Tue Jan 18 2011 - Jonathan Dieter <jdieter at lesbg.com> - 3.6-0.4.20110118git
+- Re-enable Python 3 support, but it still won't work even though it builds
+- Remove upstreamed patches
+
 * Tue Jan 18 2011 - Richard W.M. Jones <rjones at redhat.com> - 3.6-0.3.20101230git
 - Disable Python 3 support, since it is quite broken.
 
diff --git a/sources b/sources
index 2a75262..573a22f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d18bc27e956d2feb978a8fe6efeae363  deltarpm-git-20101230.tar.bz2
+c77a5c35f68f6705e75cd281184ade29  deltarpm-git-20110118.tar.bz2