Attachment 586747 Details for Bug 531543 – Adds an rpm-python3 subpackage

[patch] Adds an rpm-python3 subpackage

add-python3-subpackage.patch (text/plain), 4.66 KB, created by Dave Malcolm on 2012-05-25 02:22:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Malcolm

Created: 2012-05-25 02:22:25 UTC

Size: 4.66 KB

patch

obsolete

>diff --git a/rpm-4.10.0-py3k-fixes.patch b/rpm-4.10.0-py3k-fixes.patch
>new file mode 100644
>index 0000000..b2a9233
>--- /dev/null
>+++ b/rpm-4.10.0-py3k-fixes.patch
>@@ -0,0 +1,12 @@
>+diff -up rpm-4.10.0/python/rpmfd-py.c.py3k-fixes rpm-4.10.0/python/rpmfd-py.c
>+--- rpm-4.10.0/python/rpmfd-py.c.py3k-fixes	2012-05-24 16:26:47.547668082 -0400
>++++ rpm-4.10.0/python/rpmfd-py.c	2012-05-24 16:27:05.662815443 -0400
>+@@ -230,7 +230,7 @@ static PyObject *rpmfd_read(rpmfdObject
>+ 
>+ 	if (nb > 0) {
>+ 	    PyObject *tmp = PyBytes_FromStringAndSize(buf, nb);
>+-	    PyString_ConcatAndDel(&res, tmp);
>++	    PyBytes_ConcatAndDel(&res, tmp);
>+ 	    left -= nb;
>+ 	}
>+     } while (nb > 0);
>diff --git a/rpm.spec b/rpm.spec
>index cfca29e..4143b50 100644
>--- a/rpm.spec
>+++ b/rpm.spec
>@@ -21,7 +21,7 @@
> Summary: The RPM package management system
> Name: rpm
> Version: %{rpmver}
>-Release: %{?snapver:0.%{snapver}.}1%{?dist}
>+Release: %{?snapver:0.%{snapver}.}2%{?dist}
> Group: System Environment/Base
> Url: http://www.rpm.org/
> Source0: http://rpm.org/releases/rpm-4.10.x/%{name}-%{srcver}.tar.bz2
>@@ -44,6 +44,9 @@ Patch5: rpm-4.9.90-armhfp.patch
> #conditionally applied patch for arm hardware floating point
> Patch6: rpm-4.9.0-armhfp-logic.patch
> 
>+# Fix a linker error when python 3 imports the _rpm module:
>+Patch7: rpm-4.10.0-py3k-fixes.patch
>+
> # Patches already in upstream
> 
> # These are not yet upstream
>@@ -93,6 +96,7 @@ BuildRequires: libsemanage-devel%{_isa}
> BuildRequires: ncurses-devel%{_isa}
> BuildRequires: bzip2-devel%{_isa} >= 0.9.0c-2
> BuildRequires: python-devel%{_isa} >= 2.6
>+BuildRequires: python3-devel%{_isa} >= 3.2
> BuildRequires: lua-devel%{_isa} >= 5.1
> BuildRequires: libcap-devel%{_isa}
> BuildRequires: libacl-devel%{_isa}
>@@ -176,7 +180,7 @@ Requires: rpm-build-libs%{_isa} = %{version}-%{release}
> This package contains support for digitally signing RPM packages.
> 
> %package python
>-Summary: Python bindings for apps which will manipulate RPM packages
>+Summary: Python 2 bindings for apps which will manipulate RPM packages
> Group: Development/Libraries
> Requires: rpm = %{version}-%{release}
> 
>@@ -185,7 +189,20 @@ The rpm-python package contains a module that permits applications
> written in the Python programming language to use the interface
> supplied by RPM Package Manager libraries.
> 
>-This package should be installed if you want to develop Python
>+This package should be installed if you want to develop Python 2
>+programs that will manipulate RPM packages and databases.
>+
>+%package python3
>+Summary: Python 3 bindings for apps which will manipulate RPM packages
>+Group: Development/Libraries
>+Requires: rpm = %{version}-%{release}
>+
>+%description python3
>+The rpm-python3 package contains a module that permits applications
>+written in the Python programming language to use the interface
>+supplied by RPM Package Manager libraries.
>+
>+This package should be installed if you want to develop Python 3
> programs that will manipulate RPM packages and databases.
> 
> %package apidocs
>@@ -226,6 +243,8 @@ packages on a system.
> %patch6 -p1 -b .armhfp-logic
> %endif
> 
>+%patch7 -p1 -b .py3k-fixes
>+
> %if %{with int_bdb}
> ln -s db-%{bdbver} db
> %endif
>@@ -253,16 +272,32 @@ export CPPFLAGS CFLAGS LDFLAGS
>     --with-lua \
>     --with-selinux \
>     --with-cap \
>-    --with-acl \
>-    --enable-python
>+    --with-acl
> 
> make %{?_smp_mflags}
> 
>+pushd python
>+PKG_CONFIG_PATH=.. \
>+CFLAGS="-I../include -Wl,-L../rpmio/.libs -Wl,-L../lib/.libs -Wl,-L../build/.libs -Wl,-L../sign/.libs $RPM_OPT_FLAGS" \
>+   %{__python} setup.py build
>+
>+PKG_CONFIG_PATH=.. \
>+CFLAGS="-I../include -Wl,-L../rpmio/.libs -Wl,-L../lib/.libs -Wl,-L../build/.libs -Wl,-L../sign/.libs $RPM_OPT_FLAGS" \
>+  %{__python3} setup.py build
>+popd
>+
> %install
> rm -rf $RPM_BUILD_ROOT
> 
> make DESTDIR="$RPM_BUILD_ROOT" install
> 
>+pushd python
>+PKG_CONFIG_PATH=.. \
>+  %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
>+PKG_CONFIG_PATH=.. \
>+  %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
>+popd
>+
> # Save list of packages through cron
> mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily
> install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/rpm
>@@ -420,6 +455,12 @@ exit 0
> %files python
> %defattr(-,root,root)
> %{python_sitearch}/rpm
>+%{python_sitearch}/rpm_python-%{version}-py2.7.egg-info
>+
>+%files python3
>+%defattr(-,root,root)
>+%{python3_sitearch}/rpm
>+%{python3_sitearch}/rpm_python-%{version}-py3.2.egg-info
> 
> %files devel
> %defattr(-,root,root)
>@@ -439,6 +480,9 @@ exit 0
> %doc COPYING doc/librpm/html/*
> 
> %changelog
>+* Thu May 24 2012 David Malcolm <dmalcolm@redhat.com> - 4.10.0-2
>+- add python3 subpackage
>+
> * Thu May 24 2012 Panu Matilainen <pmatilai@redhat.com> - 4.10.0-1
> - update to 4.10.0 final
>

Actions: View | Diff

Attachments on bug 531543: 368275 | 368276 | 395412 | 395413 | 395414 | 395415 | 586747 | 731128