[packages/rpm/dev-5.4.17] - remove unpackaged scripts and fix bad interpreter shebang

qboosh qboosh at pld-linux.org
Wed Feb 5 17:22:20 CET 2020


commit ed5b05d825ac9e355c5c5c09d3adac8b26c13e58
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 2 23:03:06 2020 +0900

    - 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.spec b/rpm.spec
index 29f2d8e..e501848 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1289,7 +1289,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}
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 <peroyvind at mandriva.org>
 @@ -16,7 +16,8 @@ from pkg_resources import Distribution,
  from distutils.sysconfig import get_python_lib
  from subprocess import Popen, PIPE, STDOUT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/cffb64ba2db7b311147604c09b2ed00ea8974d6d



More information about the pld-cvs-commit mailing list