Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2022-02-05 23:22:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Sat Feb 5 23:22:52 2022 rev:293 rq:950425 version:4.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2021-11-03 17:25:12.737302648
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.1898/rpm.changes 2022-02-05
23:22:54.236039299 +0100
@@ -1,0 +2,17 @@
+Tue Feb 1 12:47:02 UTC 2022 - Dirk M??ller <dmuel...@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 <dmuel...@suse.com>
+
+- switch to glibc-locale-base to reduce system installation size
+ by ~220MB (bsc#1195390)
+
+-------------------------------------------------------------------
+Wed Dec 22 14:57:27 CET 2021 - o...@aepfle.de
+
+- Update OCaml requires/provides generators to ignore cmxs
+ new patch: ocaml-cmxs.diff
+
+-------------------------------------------------------------------
New:
----
ocaml-cmxs.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-rpm.spec ++++++
--- /var/tmp/diff_new_pack.wmvO9s/_old 2022-02-05 23:22:55.652029614 +0100
+++ /var/tmp/diff_new_pack.wmvO9s/_new 2022-02-05 23:22:55.656029587 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-rpm
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2017 Neal Gompa <ngomp...@gmail.com>.
#
# All modifications and additions to the file contributed by third parties
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.wmvO9s/_old 2022-02-05 23:22:55.696029313 +0100
+++ /var/tmp/diff_new_pack.wmvO9s/_new 2022-02-05 23:22:55.700029286 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpm
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -117,6 +117,7 @@
Patch132: verbosearg.diff
Patch133: zstdpool.diff
Patch134: zstdthreaded.diff
+Patch135: ocaml-cmxs.diff
Patch200: finddebuginfo.diff
Patch201: finddebuginfo-absolute-links.diff
Patch202: debugsubpkg.diff
@@ -183,7 +184,7 @@
#Requires: gcc-PIE
Requires: gettext-tools
Requires: glibc-devel
-Requires: glibc-locale
+Requires: glibc-locale-base
Requires: grep
Requires: gzip
Requires: make
@@ -245,6 +246,7 @@
%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
@@ -376,7 +378,7 @@
rm -rf %{buildroot}/%{_libdir}/python%{py_ver}
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
-sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
+bash %{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.
++++++ ocaml-cmxs.diff ++++++
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 <o...@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
