Switch rpm-build to system-python (RHBZ #1405483)

References: https://bugzilla.redhat.com/show_bug.cgi?id=1405483
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
This commit is contained in:
Igor Gnatenko 2016-12-18 16:44:02 +01:00
parent eadbbd1b84
commit 6a38aee710
2 changed files with 16 additions and 1 deletions

View File

@ -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 <proyvind@moondrake.org>

View File

@ -29,7 +29,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}7%{?dist} Release: %{?snapver:0.%{snapver}.}8%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 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 Patch138: rpm-4.13.x-pythondistdeps.py-skip-.egg-link-files.patch
Patch139: rpm-4.13.x-pythondistdeps.py-add-forgotten-import.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 # These are not yet upstream
Patch302: rpm-4.7.1-geode-i686.patch Patch302: rpm-4.7.1-geode-i686.patch
# Probably to be upstreamed in slightly different form # Probably to be upstreamed in slightly different form
@ -558,6 +561,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Sun Dec 18 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 4.13.0-8
- Switch rpm-build to system-python (RHBZ #1405483)
* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 4.13.0-7 * Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 4.13.0-7
- Rebuild for Python 3.6 - Rebuild for Python 3.6