- don't install and package some useless scripts

- rel 58

diff --git a/dont-install-useless-scripts.patch b/dont-install-useless-scripts.patch
new file mode 100644 (file)
index 0000000..e7d5146
--- /dev/null
+++ b/dont-install-useless-scripts.patch
@@ -0,0 +1,30 @@
+--- rpm-5.4.15/scripts/Makefile.am~    2020-03-24 21:47:43.000000000 +0100
++++ rpm-5.4.15/scripts/Makefile.am     2020-03-24 21:48:32.579305528 +0100
+@@ -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
+ 
+ 
+-pkglibbindir =                @USRLIBRPM@/bin
+-pkglibbin_SCRIPTS = api-sanity-autotest.pl api-sanity-checker.pl mgo pom2spec
+-
+ pkglibhelperdir =     @USRLIBRPM@/helpers
+ pkglibhelper_SCRIPTS =        ${HELPERS}
+ 

diff --git a/rpm.spec b/rpm.spec
index 674c1ef318e87f0b99b12a28c3372e43b8c4727e..c06e8f4b4add85d40255bd5f4464d1c5e33af919 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -47,7 +47,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15

-Release:       57
+Release:       58

 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm


@@ -176,6 +176,7 @@ Patch96:    skip-ldconfig-optimization.patch
 Patch97:       glibc.patch
 Patch98:       extension-based-compression-detection.patch
 Patch99:       %{name}-gpg-pinentry.patch
 Patch97:       glibc.patch
 Patch98:       extension-based-compression-detection.patch
 Patch99:       %{name}-gpg-pinentry.patch

+Patch100:      dont-install-useless-scripts.patch

 
 # Patches imported from Mandriva
 
 
 # Patches imported from Mandriva
 


@@ -957,6 +958,7 @@ cd -
 %patch96 -p1
 %patch97 -p1
 %patch98 -p1
 %patch96 -p1
 %patch97 -p1
 %patch98 -p1

+%patch100 -p1

 
 %patch1050 -p1
 
 
 %patch1050 -p1
 


@@ -1445,7 +1447,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/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
 %attr(755,root,root) %{_rpmlibdir}/bin/mtree
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmcache
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp


@@ -1496,19 +1497,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}/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
 %{!?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
 %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
 # 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