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

ocaml-cmxs.diff

@@ -1,46 +0,0 @@
-Update OCaml requires/provides to ignore cmxs
-
-OCaml cmxs files are static libraries, which can be loaded at runtime
-via the Dynlink module. They apparently do not provide any useful
-runtime dependency information to be stored into the packages
-Provides/Requires list. Therefore just skip them.
-
-Adjust attr, remove extension and ELF magic
-Adjust ocamldeps, do nothing with cmxs files.
-
-Fixes: a6fe37c39b39acbcbd014dd1e6d5653ff84254a1
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
-
---- ./fileattrs/ocaml.attr.orig	2021-06-21 12:00:44.587611741 +0000
-+++ ./fileattrs/ocaml.attr	2021-12-22 13:54:20.384959876 +0000
-@@ -1,5 +1,5 @@
- %__ocaml_provides	%{_rpmconfigdir}/ocamldeps.sh --provides
- %__ocaml_requires	%{_rpmconfigdir}/ocamldeps.sh --requires
--%__ocaml_magic		^(ELF|Objective caml|OCaml) .*$
--%__ocaml_path		.(cma|cmi|cmo|cmx|cmxa|cmxs)$
-+%__ocaml_magic		^(Objective caml|OCaml) .*$
-+%__ocaml_path		.(cma|cmi|cmo|cmx|cmxa)$
- %__ocaml_flags		magic_and_path
---- ./scripts/ocamldeps.sh.orig	2021-06-21 12:00:44.650612737 +0000
-+++ ./scripts/ocamldeps.sh	2021-12-22 13:54:20.384959876 +0000
-@@ -32,6 +32,10 @@
- #   Implementations imported:
- #     HASH NAME_FROM_OTHER_MODULE
- #
-+# cmxs files are recoqnized, but need to be ignored.
-+# They contain references of the interfaces and implementations
-+# compiled into them.
-+#
- # The hash may contain just '-', in which case it is ignored.
- #
- # Output:
-@@ -236,7 +240,7 @@ do
-   *.cmo)  parse "${filename}" ;;
-   *.cmx)  parse "${filename}" ;;
-   *.cmxa) parse "${filename}" ;;
--  *.cmxs) parse "${filename}" ;;
-+  *.cmxs) ;;
-   *) continue ;;
-   esac
- done

python-rpm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-rpm
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2017 Neal Gompa <ngompa13@gmail.com>.
 #
 # All modifications and additions to the file contributed by third parties

rpm.changes

@@ -1,20 +1,3 @@
--------------------------------------------------------------------
-Tue Feb  1 12:47:02 UTC 2022 - Dirk Müller <dmueller@suse.com>
-
-- invoke find-lang.sh with bash, it is a bash script (bsc#1195391) 
-
--------------------------------------------------------------------
-Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller <dmueller@suse.com>
-
-- switch to glibc-locale-base to reduce system installation size
-  by ~220MB (bsc#1195390)
-
--------------------------------------------------------------------
-Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de
-
-- Update OCaml requires/provides generators to ignore cmxs
-  new patch: ocaml-cmxs.diff
-
 -------------------------------------------------------------------
 Thu Oct 14 18:16:22 CEST 2021 - mls@suse.de
 

rpm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rpm
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -117,7 +117,6 @@ Patch131:       posttrans.diff
 Patch132:       verbosearg.diff
 Patch133:       zstdpool.diff
 Patch134:       zstdthreaded.diff
-Patch135:       ocaml-cmxs.diff
 Patch200:       finddebuginfo.diff
 Patch201:       finddebuginfo-absolute-links.diff
 Patch202:       debugsubpkg.diff
@@ -184,7 +183,7 @@ Requires:       gcc
 #Requires:       gcc-PIE
 Requires:       gettext-tools
 Requires:       glibc-devel
-Requires:       glibc-locale-base
+Requires:       glibc-locale
 Requires:       grep
 Requires:       gzip
 Requires:       make
@@ -238,7 +237,7 @@ rm -rf sqlite
 %patch                         -P 24 -P 25 -P 26             -P 29
 %patch -P 30       -P 32 -P 33 -P 34       -P 36       -P 38
 %patch                   -P 43       -P 45 -P 46 -P 47
-%patch       -P 51
+%patch       -P 51                             
 %patch -P 60 -P 61                         -P 66 -P 67       -P 69
 %patch -P 70 -P 71       -P 73       -P 75       -P 77 -P 78
 %patch                               -P 85
@@ -246,7 +245,6 @@ rm -rf sqlite
 %patch -P 100        -P 102 -P 103
 %patch                                                  -P 117
 %patch -P 122 -P 123               -P 131 -P 132 -P 133 -P 134
-%patch -P 135
 
 # debugedit patches
 pushd debugedit-5.0
@@ -378,7 +376,7 @@ install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm
 rm -rf %{buildroot}/%{_libdir}/python%{py_ver}
 rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
-bash %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
+sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
 # On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros
 %ifarch armv7hl armv6hl
 # rpm is using the host_cpu as default for the platform, but armv6/7hl is not known by the kernel.