From 6a38aee710629f3d5650eb013a7616a60e0d5f6d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Dec 18 2016 15:44:02 +0000 Subject: Switch rpm-build to system-python (RHBZ #1405483) References: https://bugzilla.redhat.com/show_bug.cgi?id=1405483 Signed-off-by: Igor Gnatenko --- diff --git a/rpm-4.13.x-pythondistdeps-system-python.patch b/rpm-4.13.x-pythondistdeps-system-python.patch new file mode 100644 index 0000000..eca743e --- /dev/null +++ b/rpm-4.13.x-pythondistdeps-system-python.patch @@ -0,0 +1,9 @@ +diff -uNr rpm-4.13.0.orig/scripts/pythondistdeps.py rpm-4.13.0/scripts/pythondistdeps.py +--- rpm-4.13.0.orig/scripts/pythondistdeps.py 2016-12-18 12:25:21.287632679 +0100 ++++ rpm-4.13.0/scripts/pythondistdeps.py 2016-12-18 12:25:48.857479226 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/libexec/system-python + # -*- coding: utf-8 -*- + # + # Copyright 2010 Per Øyvind Karlsen diff --git a/rpm.spec b/rpm.spec index 2886e97..7326f9a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}7%{?dist} +Release: %{?snapver:0.%{snapver}.}8%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 @@ -62,6 +62,9 @@ Patch137: rpm-4.13.x-pythondistdeps.py-show-warning-if-version-is-not-fou.patch Patch138: rpm-4.13.x-pythondistdeps.py-skip-.egg-link-files.patch Patch139: rpm-4.13.x-pythondistdeps.py-add-forgotten-import.patch +# Fedora-specific (system-python) patch (RHBZ #1405483) +Patch140: rpm-4.13.x-pythondistdeps-system-python.patch + # These are not yet upstream Patch302: rpm-4.7.1-geode-i686.patch # Probably to be upstreamed in slightly different form @@ -558,6 +561,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Sun Dec 18 2016 Igor Gnatenko - 4.13.0-8 +- Switch rpm-build to system-python (RHBZ #1405483) + * Fri Dec 09 2016 Charalampos Stratakis - 4.13.0-7 - Rebuild for Python 3.6