From 21fe6e89631433eec6b040dcc43c1b9b9859ac2b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jan 06 2017 14:06:51 +0000 Subject: use python3 instead of system-python for rpm-build Signed-off-by: Igor Gnatenko --- diff --git a/rpm-4.13.x-pythondistdeps-python3.patch b/rpm-4.13.x-pythondistdeps-python3.patch new file mode 100644 index 0000000..eb4c6ae --- /dev/null +++ b/rpm-4.13.x-pythondistdeps-python3.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/bin/python3 + # -*- coding: utf-8 -*- + # + # Copyright 2010 Per Øyvind Karlsen diff --git a/rpm-4.13.x-pythondistdeps-system-python.patch b/rpm-4.13.x-pythondistdeps-system-python.patch deleted file mode 100644 index eca743e..0000000 --- a/rpm-4.13.x-pythondistdeps-system-python.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 319c733..780d2d9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -62,8 +62,8 @@ 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 +# Fedora-specific (python3) patch (RHBZ #1405483) +Patch140: rpm-4.13.x-pythondistdeps-python3.patch # These are not yet upstream Patch302: rpm-4.7.1-geode-i686.patch