Accepting request 109136 from home:vuntz:branches:Base:System

Fix find-lang to work with new XDG help system

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

rpm.spec

@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           rpm
 BuildRequires:  binutils
 BuildRequires:  bzip2
@@ -118,7 +117,7 @@ Patch61:        noprereqdeprec.diff
 Patch62:        pythondeps.diff
 Patch63:        fontprovides.diff
 Patch64:        rpm-gst-provides.patch
-Patch65:        langnoc.diff
+Patch65:        findlang-new-help.diff
 Patch66:        initscriptsprov.diff
 Patch67:        remove-translations.diff
 Patch68:        no_rep_autop.diff
@@ -136,6 +135,8 @@ Patch79:        headerchk.diff
 Patch80:        rpm-deptracking.patch
 Patch81:        python3-abi-kind.diff
 Patch82:        perl-python-attr.patch
+Patch83:        findlang-new-help-fix.diff
+Patch84:        langnoc.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -169,19 +170,20 @@ need an intimate knowledge of RPM packages in order to function.
 Summary:        Tools and Scripts to create rpm packages
 Group:          System/Packages
 Requires:       rpm = %{version}
-Provides:       rpmbuild rpm:%_bindir/rpmbuild
+Provides:       rpm:%_bindir/rpmbuild
+Provides:       rpmbuild
 # SUSE's build essentials
-Requires:       bzip2
-Requires:       xz
-Requires:       gzip
 Requires:       binutils
-Requires:       make
+Requires:       bzip2
+Requires:       findutils
 Requires:       gcc
 Requires:       gettext-tools
-Requires:       findutils
-Requires:       patch
 Requires:       glibc-devel
+Requires:       gzip
+Requires:       make
+Requires:       patch
 Requires:       perl-base
+Requires:       xz
 
 %description build
 If you want to build a rpm, you need this package. It provides rpmbuild
@@ -208,7 +210,7 @@ rm -f rpmdb/db.h
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 
-%patch -P 80 -P 81 -P 82
+%patch -P 80 -P 81 -P 82 -P 83 -P 84
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov