[packages/rpm/dev-5.4.17] - don't install and package some useless scripts

[qboosh]

commit c9e7fbb2ba7e86eecab41d7c853c28b5d91267a6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Mar 24 21:56:01 2020 +0100

    - don't install and package some useless scripts

 dont-install-useless-scripts.patch | 30 ++++++++++++++++++++++++++++++
 rpm.spec                           | 10 +++-------
 2 files changed, 33 insertions(+), 7 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 5802982..9619b02 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -180,7 +180,8 @@ Patch92:	fast_python_deps.patch
 Patch93:	python2_explicit.patch
 Patch97:	glibc.patch
 Patch98:	extension-based-compression-detection.patch
-Patch100:	%{name}-gettid.patch
+Patch100:	dont-install-useless-scripts.patch
+Patch101:	%{name}-gettid.patch
 
 # Patches imported from Mandriva
 
@@ -958,6 +959,7 @@ cd -
 %patch97 -p1
 %patch98 -p1
 %patch100 -p1
+%patch101 -p1
 
 %patch1050 -p1
 
@@ -1468,7 +1470,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_rpmlibdir}/bin/cp
 %attr(755,root,root) %{_rpmlibdir}/bin/debugedit
 %attr(755,root,root) %{_rpmlibdir}/bin/find
-%attr(755,root,root) %{_rpmlibdir}/bin/mgo
 %attr(755,root,root) %{_rpmlibdir}/bin/mtree
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmcache
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp
@@ -1519,19 +1520,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh
 # needs hacked pkg-config to return anything
 %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
-%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-autotest.pl
-%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-checker.pl
 %{!?with_sqlite:%attr(755,root,root) %{_rpmlibdir}/bin/dbsql}
 %attr(755,root,root) %{_rpmlibdir}/bin/install-sh
 %attr(755,root,root) %{_rpmlibdir}/bin/mkinstalldirs
-%attr(755,root,root) %{_rpmlibdir}/bin/pom2spec
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmspec
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump
 %attr(755,root,root) %{_rpmlibdir}/bin/sqlite3
 %attr(755,root,root) %{_rpmlibdir}/bin/wget
 %attr(755,root,root) %{_rpmlibdir}/vcheck
-# not used yet ... these six depend on perl
-%attr(755,root,root) %{_rpmlibdir}/http.req
 # we always used scripts provided by mono-devel, maybe move them here
 #%attr(755,root,root) %{_rpmlibdir}/mono-find-provides
 #%attr(755,root,root) %{_rpmlibdir}/mono-find-requires
diff --git a/dont-install-useless-scripts.patch b/dont-install-useless-scripts.patch
new file mode 100644
index 0000000..939fcac
--- /dev/null
+++ b/dont-install-useless-scripts.patch
@@ -0,0 +1,30 @@
+--- rpm-5.4.17/scripts/Makefile.am.orig	2020-04-13 14:51:12.941558924 +0200
++++ rpm-5.4.17/scripts/Makefile.am	2020-04-13 15:11:37.324925869 +0200
+@@ -48,7 +48,7 @@
+ 
+ noinst_SCRIPTS =
+ 
+-noinst_SCRIPTS += multiarch-dispatch multiarch-platform
++noinst_SCRIPTS += multiarch-dispatch multiarch-platform api-sanity-autotest.pl api-sanity-checker.pl mgo pom2spec http.req
+ bin_SCRIPTS = gendiff
+ 
+ 
+@@ -61,7 +61,7 @@
+ 	check-files cross-build dbconvert.sh executabledeps.sh \
+ 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
+ 	find-provides.perl find-requires.perl \
+-	fontconfig.prov gem_helper.rb getpo.sh http.req \
++	fontconfig.prov gem_helper.rb getpo.sh \
+ 	kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \
+ 	mono-find-provides mono-find-requires \
+ 	osgideps.pl pkgconfigdeps.sh \
+@@ -74,9 +74,6 @@
+ 	vcheck vpkg-provides.sh vpkg-provides2.sh
+ 
+ 
+-pkgbindir =		@USRLIBRPM@/bin
+-pkgbin_SCRIPTS = api-sanity-autotest.pl api-sanity-checker.pl mgo pom2spec
+-
+ pkghelperdir =		@USRLIBRPM@/helpers
+ pkghelper_SCRIPTS = 	${HELPERS}
+ 
================================================================

---- gitweb:

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