From 0123653c89b36bbfd5098bade10a95876b9123d4 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: May 23 2017 08:49:46 +0000 Subject: Fix rpmsign python module import failing (#1393659) --- diff --git a/rpm-4.13.0-python-rpmsign.patch b/rpm-4.13.0-python-rpmsign.patch new file mode 100644 index 0000000..3e535b6 --- /dev/null +++ b/rpm-4.13.0-python-rpmsign.patch @@ -0,0 +1,22 @@ +From eb632e5158fa4ef993b0e5df2a354f0be7a7a71d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Wed, 20 Apr 2016 15:39:36 +0200 +Subject: [PATCH] Use correct source file for rpmsign module + +--- + python/setup.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/setup.py.in b/python/setup.py.in +index b2c394136..f94873fe5 100644 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -48,7 +48,7 @@ rpmbuild_mod = Extension('rpm._rpmb', + ) + + rpmsign_mod = Extension('rpm._rpms', +- sources = ['rpmbmodule.c'], ++ sources = ['rpmsmodule.c'], + include_dirs = pkgconfig('--cflags'), + libraries = pkgconfig('--libs') + ['rpmsign'], + extra_compile_args = cflags, diff --git a/rpm.spec b/rpm.spec index 5f6d07e..3368393 100644 --- a/rpm.spec +++ b/rpm.spec @@ -33,7 +33,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}20%{?dist} +Release: %{?snapver:0.%{snapver}.}21%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 @@ -56,6 +56,7 @@ Patch4: rpm-4.8.1-use-gpg2.patch Patch5: rpm-4.12.0-rpm2cpio-hack.patch # Patches already upstream: +Patch100: rpm-4.13.0-python-rpmsign.patch Patch133: rpm-4.13.x-pythondistdeps.patch Patch134: rpm-4.13.x-pythondistdeps-Makefile.patch @@ -609,6 +610,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Tue May 23 2017 Panu Matilainen - 4.13.0.1-21 +- Fix rpmsign python module import failing (#1393659) + * Tue Apr 25 2017 Mark Wielaard - 4.13.0.1-20 - Fix rpmbuild world writable empty (tmp) dirs in debuginfo (#641022)