- post merge cleanup

diff --git a/dont-install-useless-scripts.patch b/dont-install-useless-scripts.patch
deleted file mode 100644 (file)
index e7d5146..0000000
--- a/dont-install-useless-scripts.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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/prov-req-macros b/prov-req-macros
deleted file mode 100644 (file)
index ef7867e..0000000
--- a/prov-req-macros
+++ /dev/null
@@ -1,4 +0,0 @@
-%__perl_provides       %{_rpmhome}/perl.prov
-%__perl_requires       %{_rpmhome}/perl.req
-%__python_provides     %{_rpmhome}/pythoneggs.py --provides
-%__python_requires     %{_rpmhome}/pythoneggs.py --requires

diff --git a/rpm.spec b/rpm.spec
index 9d182e623b30283d7728836151edc4fc1229d59c..c3257aad2b5892b654b7cb9c3dfc9b633066fb84 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -852,9 +852,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch %{arm}
 %{_rpmlibdir}/platform/arm*
 %endif
-%ifarch aarch64
-%{_rpmlibdir}/aarch64*
-%endif
 %ifarch ia64
 %{_rpmlibdir}/platform/ia64*
 %endif