Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpm-config-SUSE for openSUSE:Factory
checked in at 2021-04-18 21:44:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm-config-SUSE (Old)
and /work/SRC/openSUSE:Factory/.rpm-config-SUSE.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm-config-SUSE"
Sun Apr 18 21:44:04 2021 rev:18 rq:885341 version:0.g76
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm-config-SUSE/rpm-config-SUSE.changes
2020-11-07 21:01:16.498036141 +0100
+++
/work/SRC/openSUSE:Factory/.rpm-config-SUSE.new.12324/rpm-config-SUSE.changes
2021-04-18 21:44:13.960632773 +0200
@@ -1,0 +2,12 @@
+Fri Mar 05 15:52:55 UTC 2021 - lnus...@suse.de
+
+- Update to version 0.g76:
+ * Prepare usrmerge (boo#1029961)
+ * scripts/find-provides.ksyms: Handle XZ compressed kernel (boo#1179251).
+ * find-requires.ksyms: use "if kernel" conditional for modules-load.d
+ * find-requires.ksyms: actually generate modules-load.d dependencies
+ * find-requires.ksyms: Silence the awk warning
+ * find-provides.ksyms: Fix kernel version test
+ * find-provides.ksyms: Fix ksym-provides test
+
+-------------------------------------------------------------------
Old:
----
rpm-config-SUSE-0.g64.tar.xz
New:
----
rpm-config-SUSE-0.g76.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-config-SUSE.spec ++++++
--- /var/tmp/diff_new_pack.NoiyzB/_old 2021-04-18 21:44:14.436633578 +0200
+++ /var/tmp/diff_new_pack.NoiyzB/_new 2021-04-18 21:44:14.440633584 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rpm-config-SUSE
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2018 Neal Gompa <ngomp...@gmail.com>.
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: rpm-config-SUSE
-Version: 0.g64
+Version: 0.g76
Release: 0
Summary: SUSE specific RPM configuration files
License: GPL-2.0-or-later
@@ -48,6 +48,11 @@
-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%{?usrmerged}
+ -e 's/@usrmerged@/%{?usrmerged}/' \
+%else
+ -e '/@usrmerged@/d' \
+%endif
%if 0%{?is_opensuse}
-e '/@sle_version@%{?sle_version:nomatch}/d' \
-e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \
++++++ _service ++++++
--- /var/tmp/diff_new_pack.NoiyzB/_old 2021-04-18 21:44:14.468633632 +0200
+++ /var/tmp/diff_new_pack.NoiyzB/_new 2021-04-18 21:44:14.468633632 +0200
@@ -5,6 +5,7 @@
<param
name="parent-tag">e56ce28a20ccfa1d37d3b66eb943bd12922b61ae</param>
<param name="versionformat">0.g@TAG_OFFSET@</param>
<param name="changesgenerate">enable</param>
+ <param name="extract">package/rpm-config-SUSE.spec</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.NoiyzB/_old 2021-04-18 21:44:14.488633665 +0200
+++ /var/tmp/diff_new_pack.NoiyzB/_new 2021-04-18 21:44:14.488633665 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/rpm-config-SUSE</param>
- <param
name="changesrevision">33376665c4252c8b3262fdb9fe6fb449feedfbb7</param>
+ <param
name="changesrevision">3f94ae98928a02f0b4c1679849e149d0896a13c9</param>
</service>
</servicedata>
\ No newline at end of file
++++++ rpm-config-SUSE-0.g64.tar.xz -> rpm-config-SUSE-0.g76.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g64/fileattrs/modulesload.attr
new/rpm-config-SUSE-0.g76/fileattrs/modulesload.attr
--- old/rpm-config-SUSE-0.g64/fileattrs/modulesload.attr 1970-01-01
01:00:00.000000000 +0100
+++ new/rpm-config-SUSE-0.g76/fileattrs/modulesload.attr 2021-03-05
14:21:50.000000000 +0100
@@ -0,0 +1,2 @@
+%__modulesload_requires %{_rpmconfigdir}/find-requires.ksyms
--tumbleweed %{?sle_version:0}%{!?sle_version:1}
+%__modulesload_path ^/usr/lib/modules-load.d/.*\.conf$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/rpm-config-SUSE-0.g64/package/rpm-config-SUSE.changes
new/rpm-config-SUSE-0.g76/package/rpm-config-SUSE.changes
--- old/rpm-config-SUSE-0.g64/package/rpm-config-SUSE.changes 2020-10-26
12:08:10.000000000 +0100
+++ new/rpm-config-SUSE-0.g76/package/rpm-config-SUSE.changes 2021-03-05
14:21:50.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Mar 3 16:59:22 UTC 2021 - Ludwig Nussel <lnus...@suse.de>
+
+- Prepare usrmerge (boo#1029961): add %usrmerged macro
+
+-------------------------------------------------------------------
Mon Dec 16 17:58:53 UTC 2019 - Neal Gompa <ngomp...@gmail.com>
- Add ldconfig_scriptlets macros for RH/Fedora compatibility
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g64/package/rpm-config-SUSE.spec
new/rpm-config-SUSE-0.g76/package/rpm-config-SUSE.spec
--- old/rpm-config-SUSE-0.g64/package/rpm-config-SUSE.spec 2020-10-26
12:08:10.000000000 +0100
+++ new/rpm-config-SUSE-0.g76/package/rpm-config-SUSE.spec 2021-03-05
14:21:50.000000000 +0100
@@ -48,6 +48,11 @@
-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%{?usrmerged}
+ -e 's/@usrmerged@/%{?usrmerged}/' \
+%else
+ -e '/@usrmerged@/d' \
+%endif
%if 0%{?is_opensuse}
-e '/@sle_version@%{?sle_version:nomatch}/d' \
-e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g64/scripts/find-provides.ksyms
new/rpm-config-SUSE-0.g76/scripts/find-provides.ksyms
--- old/rpm-config-SUSE-0.g64/scripts/find-provides.ksyms 2020-10-26
12:08:10.000000000 +0100
+++ new/rpm-config-SUSE-0.g76/scripts/find-provides.ksyms 2021-03-05
14:21:50.000000000 +0100
@@ -26,7 +26,7 @@
;;
*/boot/vmlinu[xz]-*)
version=${f##*/vmlinu[xz]-}
- version=${version%.gz}
+ version=${version%.[gx]z}
inst_prefix="$(dirname $f)"
inst_prefix="$(dirname $inst_prefix)"
echo "kernel-uname-r = $version"
@@ -74,15 +74,15 @@
objdir_build=$RPM_BUILD_ROOT$(readlink
$RPM_BUILD_ROOT/lib/modules/$version/build)
for i in $objdir_build $objdir ; do
ksym_provides=$i/scripts/mod/ksym-provides
- [ -x $ksym_provides ] && break
+ [ -x "$ksym_provides" ] && break
done
- if [ -x $ksym_provides ] ; then
- $ksym_provides $flavor $f
+ if [ -x "$ksym_provides" ] ; then
+ "$ksym_provides" $flavor $f
else
major=${version%%.*}
sub=${version#*.}
sub=${sub%%.*}
- if [ "$major" -ge 4 -a "$sub" -ge 10 ] ; then
+ if [ "$major" -gt 4 -o \( "$major" -eq 4 -a "$sub" -ge 10 \) ] ;
then
echo "error: cannot determine ksym provides of $f -
missing ksym-povides tool." >&2
else
nm "$f" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g64/scripts/find-requires.ksyms
new/rpm-config-SUSE-0.g76/scripts/find-requires.ksyms
--- old/rpm-config-SUSE-0.g64/scripts/find-requires.ksyms 2020-10-26
12:08:10.000000000 +0100
+++ new/rpm-config-SUSE-0.g76/scripts/find-requires.ksyms 2021-03-05
14:21:50.000000000 +0100
@@ -36,7 +36,7 @@
while read x ; do modsexp="$modsexp|$(basename "$x" .ko | tr '-' '_')" ; done
<< EOF
$(echo "${modules[@]}" | tr ' ' '\n')
EOF
-echo $modreqs | tr ' -' '\n_' | grep -vE "^(|($modsexp).ko)\$" | while read x;
do echo "kmod($x)" ; done
+echo $modreqs | tr ' -' '\n_' | grep -vE "^(|($modsexp).ko)\$" | while read x;
do echo "(kmod($x) if kernel)" ; done
if $is_tumbleweed; then
for module in "${modules[@]}"; do
@@ -110,7 +110,7 @@
| awk '
{ FS = "\t" ; OFS = "\t" }
{ split($1, arr, "/")
- flavor = gensub(/.*-/, "", "", arr[1]) }
+ flavor = gensub(/.*-/, "", 1, arr[1]) }
NF == 3 { print "kernel(" flavor ":" $2 ") = " $3
next }
{ print "ksym(" flavor ":" arr[3] ") = " arr[2] }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g64/suse_macros.in
new/rpm-config-SUSE-0.g76/suse_macros.in
--- old/rpm-config-SUSE-0.g64/suse_macros.in 2020-10-26 12:08:10.000000000
+0100
+++ new/rpm-config-SUSE-0.g76/suse_macros.in 2021-03-05 14:21:50.000000000
+0100
@@ -1,6 +1,8 @@
# need to keep this around for a while
%suse_check %{nil}
+%usrmerged @usrmerged@
+
# directories
%_infodir %{_prefix}/share/info
%_mandir %{_prefix}/share/man
@@ -9,7 +11,7 @@
%_defaultdocdir %{_usr}/share/doc/packages
%_fillupdir %{_usr}/share/fillup-templates
%_distconfdir %{_usr}/etc
-%_firmwaredir /lib/firmware
+%_firmwaredir %{?usrmerged:%{_usr}}/lib/firmware
# package build macros
%make_install make install DESTDIR=%{?buildroot}
