Merge branch 'c9' into a9

SOURCES/find-provides

@@ -30,7 +30,7 @@ done
 
 is_kmod=1
 for f in $filelist; do
-    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ]
+    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ]
     then
         is_kernel=1;
     fi

SOURCES/find-requires

@@ -22,7 +22,7 @@ filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
 unset is_kmod
 
 for f in $filelist; do
-    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ]
+    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ]
     then
         is_kmod=1;
     elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]

SOURCES/macros

@@ -301,6 +301,9 @@ print(result)
 %_annobin_clang_plugin	%dnl-fplugin=/usr/lib64/clang/`clang -dumpversion`/lib/annobin.so
 %_annotation_cflags     %{?_annotated_build:%{expand:%%{_annobin_%{toolchain}_plugin}}}
 %_annotation_ldflags	%{?_lto_cflags:%{_annotation_cflags}}
+# Use the remove-section option to force the find-debuginfo script
+# to move the annobin notes into the separate debuginfo file.
+%_find_debuginfo_vendor_opts %{?_annotated_build:--remove-section .gnu.build.attributes}
 
 # Fail linking if there are undefined symbols.  Required for proper
 # ELF symbol versioning support.  Disabled by default.

SPECS/redhat-rpm-config.spec

@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 194
+Version: 196
 Release: 1%{?dist}.alma
 # No version specified.
 License: GPL+
@@ -213,9 +213,16 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
-* Wed May 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 194-1.alma
+* Tue Nov 15 2022 Eduard Abdullin <eabdullin@almalinux.org> - 196-1.alma
 - Fix AlmaLinux detection
 
+* Mon Jun 27 2022 Nick Clifton  <nickc@redhat.com> - 196-1
+- Pass "--remove section .gnu.build.attributes" to the find-debuginfo script.
+- Resolves: rhbz#2099613
+* Wed Jun 15 2022 Florian Festi <ffesti@redhat.com> - 195-1
+- Detect compressed kernel modules
+- Resolves: rhbz#2008544
+
 * Thu Feb 17 2022 Nick Clifton  <nickc@redhat.com> - 194-1
 - Use the correct package names for the triggers.
 - Resolves: rhbz#2030671