- remove unpackaged scripts and fix bad interpreter shebang

diff --git a/rpm-pythoneggs.patch b/rpm-pythoneggs.patch
index 15c848dfdbc38721ae03e6ddbeafcb84962d4e21..06eef437b32ba191a6728817bc7e73ce49cda295 100644 (file)
--- 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 <peroyvind@mandriva.org>
 @@ -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 3854e34f97228f138810183caaa7348e008b5f7f..5da2947181cf395a9265f530d2ab55aef885b54c 100644 (file)
--- 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}