From a5bf4658a76fde619f4441fdafc6b8f2efdcdcb8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 2 Jan 2020 23:03:06 +0900 Subject: [PATCH] - remove unpackaged scripts and fix bad interpreter shebang --- rpm-pythoneggs.patch | 6 ++++++ rpm.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rpm-pythoneggs.patch b/rpm-pythoneggs.patch index 15c848d..06eef43 100644 --- a/rpm-pythoneggs.patch +++ b/rpm-pythoneggs.patch @@ -1,5 +1,11 @@ --- rpm-5.4.15.org/scripts/pythoneggs.py 2012-05-08 00:39:11.000000000 +0200 +++ rpm-5.4.15/scripts/pythoneggs.py 2018-09-27 10:32:34.661059061 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + # + # Copyright 2010 Per Øyvind Karlsen @@ -16,7 +16,8 @@ from pkg_resources import Distribution, from distutils.sysconfig import get_python_lib from subprocess import Popen, PIPE, STDOUT diff --git a/rpm.spec b/rpm.spec index 3854e34..5da2947 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1268,7 +1268,7 @@ done %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel # moved to rpm-build-macros 1.744 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/{macros.d/java,javadeps.sh} -%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/ruby +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/{macros.d/ruby,{gem_helper,rubygems}.rb} # for rpm -e|-U --repackage install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm} -- 2.44.0