- Split SUSE macros and some helpers into rpm-config-SUSE

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=472

rpm.spec

@@ -48,6 +48,7 @@ BuildRequires:  zlib-devel
 #!BuildIgnore:  rpmlint-Factory
 Provides:       rpminst
 Requires(post): %fillup_prereq
+Requires:       rpm-config-SUSE
 Summary:        The RPM Package Manager
 License:        GPL-2.0-or-later
 Group:          System/Packages
@@ -55,7 +56,6 @@ Version:        4.14.1
 Release:        0
 Source:         http://ftp.rpm.org/releases/rpm-4.14.x/rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
-Source4:        rpm-suse_macros
 Source5:        rpmsort
 Source8:        rpmconfigcheck
 Source9:        sysconfig.services-rpm
@@ -82,10 +82,8 @@ Patch24:        brp.diff
 Patch25:        brpcompress.diff
 Patch26:        checkfilesnoinfodir.diff
 Patch27:        finddebuginfo.diff
-Patch28:        findksyms.diff
 Patch29:        findlang.diff
 Patch30:        macrosin.diff
-Patch31:        modalias.diff
 Patch32:        platformin.diff
 Patch33:        rpmpopt.diff
 Patch34:        rpmrc.diff
@@ -97,9 +95,7 @@ Patch45:        whatrequires-doc.diff
 Patch46:        remove-brp-strips.diff
 Patch47:        requires-ge-macro.diff
 Patch49:        finddebuginfo-absolute-links.diff
-Patch50:        firmware.diff
 Patch51:        specfilemacro.diff
-Patch52:        modalias-encode.diff
 Patch53:        disttag-macro.diff
 Patch55:        debugsubpkg.diff
 Patch56:        debuglink.diff
@@ -107,7 +103,6 @@ Patch57:        debuginfo-mono.patch
 Patch58:        lazystatfs.diff
 Patch60:        safeugid.diff
 Patch61:        noprereqdeprec.diff
-Patch65:        initscriptsprov.diff
 Patch66:        remove-translations.diff
 Patch67:        headeradddb.diff
 Patch68:        dbprivate.diff
@@ -134,6 +129,7 @@ Patch113:       debugedit-riscv.patch
 Patch114:       source_date_epoch_buildtime.diff
 Patch115:       safesymlinks.diff
 Patch116:       verifynodup.diff
+Patch117:       findsupplements.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 Patch6465:      auto-config-update-riscv64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -222,16 +218,16 @@ rm -f rpmdb/db.h
 %patch -P 4
 %patch5 -p1
 %patch       -P 11 -P 12 -P 13 -P 14 -P 15 -P 16       -P 18
-%patch -P 20 -P 21             -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
-%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36       -P 38
+%patch -P 20 -P 21             -P 24 -P 25 -P 26 -P 27       -P 29
+%patch -P 30       -P 32 -P 33 -P 34 -P 35 -P 36       -P 38
 %patch                   -P 43       -P 45 -P 46 -P 47       -P 49
-%patch -P 50 -P 51 -P 52 -P 53       -P 55 -P 56 -P 57 -P 58
-%patch -P 60 -P 61                   -P 65 -P 66 -P 67 -P 68 -P 69
+%patch       -P 51       -P 53       -P 55 -P 56 -P 57 -P 58
+%patch -P 60 -P 61                         -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71       -P 73 -P 74 -P 75       -P 77 -P 78
 %patch                               -P 85
 %patch                   -P 93 -P 94                         -P 99
 %patch -P 100        -P 102 -P 103                             -P 108
-%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116
+%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116 -P 117
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464
@@ -242,25 +238,7 @@ rm -f rpmdb/db.h
 
 cp config.guess config.sub db/dist/
 cp config.guess config.sub beecrypt/
-#chmod 755 scripts/find-supplements{,.ksyms}
-#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
-#chmod 755 scripts/firmware.prov
-#chmod 755 scripts/debuginfo.prov
 tar -xjvf %{SOURCE1}
-sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \
-    -e 's/@sles_version@/%{?sles_version}%{!?sles_version:0}/' \
-    -e 's/@ul_version@/%{?ul_version}%{!?ul_version:0}/' \
-    -e '/@is_opensuse@%{?is_opensuse:nomatch}/d' \
-    -e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \
-    -e '/@leap_version@%{?leap_version:nomatch}/d' \
-    -e 's/@leap_version@/%{?leap_version}%{!?leap_version:0}/' \
-%if 0%{?is_opensuse}
-    -e '/@sle_version@%{?sle_version:nomatch}/d' \
-    -e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \
-%else
-    -e '/@sle_version@/d' \
-%endif
-  < %{SOURCE4} > suse_macros
 rm -f m4/libtool.m4
 rm -f m4/lt*.m4
 
@@ -314,10 +292,8 @@ mkdir -p %{buildroot}/usr/sbin
 install -m 755 %{SOURCE8} %{buildroot}/usr/sbin
 mkdir -p %{buildroot}/usr/lib/systemd/system
 install -m 644 %{SOURCE13} %{buildroot}/usr/lib/systemd/system/
-cp -a suse_macros %{buildroot}/usr/lib/rpm
 mkdir -p %{buildroot}/usr/lib/rpm/macros.d
 mkdir -p %{buildroot}/usr/lib/rpm/suse
-ln -s ../suse_macros %{buildroot}/usr/lib/rpm/suse/macros
 for d in BUILD RPMS SOURCES SPECS SRPMS BUILDROOT ; do
   mkdir -p %{buildroot}/usr/src/packages/$d
   chmod 755 %{buildroot}/usr/src/packages/$d
@@ -344,8 +320,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 install -c -m0644 %{SOURCE9} %{buildroot}%{_fillupdir}/
 rm -f %{buildroot}/usr/lib/rpm/cpanflute %{buildroot}/usr/lib/rpm/cpanflute2
 install -m 755 %{SOURCE5} %{buildroot}/usr/lib/rpm
-install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm
-install -m 755 scripts/firmware.prov %{buildroot}/usr/lib/rpm
 install -m 755 scripts/debuginfo.prov %{buildroot}/usr/lib/rpm
 rm -f %{buildroot}/usr/lib/locale %{buildroot}/usr/lib/rpmrc
 mkdir -p %{buildroot}/etc/rpm