diff --git a/modalias-kernel_module.diff b/modalias-kernel_module.diff index 293c6f9..524e02e 100644 --- a/modalias-kernel_module.diff +++ b/modalias-kernel_module.diff @@ -1,4 +1,6 @@ ---- scripts/find-supplements.ksyms +Index: scripts/find-supplements.ksyms +=================================================================== +--- scripts/find-supplements.ksyms.orig +++ scripts/find-supplements.ksyms @@ -1,6 +1,8 @@ #! /bin/sh @@ -9,7 +11,8 @@ case "$1" in kernel-module-*) ;; # Fedora kernel module package names start with -@@ -47,10 +49,53 @@ +@@ -46,11 +48,54 @@ combine_modaliases() { + print_modaliases "$class" "$variants" "$pos" } -for module in $(grep -E '/lib/modules/.+\.ko$'); do @@ -33,7 +36,7 @@ + | sed -nre "s,(.+:.+),modalias(kernel-${krel##*-}:\\1),p" | tee -a $modlist + done + if ! test -s "$modlist" && test $have_module = 0; then -+ echo "packageand(kernel-${krel##*-}:$PACKAGE-kmp)" ++ echo "packageand(kernel-${krel##*-}:$PACKAGE)" + fi + rm -f $modlist +} diff --git a/rpm-python.spec b/rpm-python.spec index c8ad497..ddb5596 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -24,7 +24,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 23 +Release: 25 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.changes b/rpm.changes index e7d4e9e..c50d60d 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 27 21:19:51 CET 2009 - agruen@suse.de + +- find-supplements.ksyms: Fix "Supplements: packageand( + kernel-$flavor:$package)" dependency (bnc#429254). + ------------------------------------------------------------------- Mon Jan 5 15:37:07 CET 2009 - mmarek@suse.cz diff --git a/rpm.spec b/rpm.spec index 9050f09..38ebad4 100644 --- a/rpm.spec +++ b/rpm.spec @@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 23 +Release: 25 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -331,7 +331,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 471 +Release: 473 # %description -n popt @@ -354,7 +354,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 471 +Release: 473 Requires: popt = 1.7 Requires: glibc-devel @@ -389,6 +389,9 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Tue Jan 27 2009 agruen@suse.de +- find-supplements.ksyms: Fix "Supplements: packageand( + kernel-$flavor:$package)" dependency (bnc#429254). * Mon Jan 05 2009 mmarek@suse.cz - findksyms.diff: make sure that the input files for join are sorted properly (bnc#450714)