Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Fri Jun 12 16:15:35 CEST 2009. -------- --- rpm/rpm.changes 2009-04-06 02:10:06.000000000 +0200 +++ rpm/rpm.changes 2009-06-09 11:55:19.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 9 11:53:50 CEST 2009 - mmarek@suse.cz + +- findksyms.diff: also generate provides for kernel packages. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.x20265/_old 2009-06-12 16:14:22.000000000 +0200 +++ /var/tmp/diff_new_pack.x20265/_new 2009-06-12 16:14:22.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 40 +Release: 41 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.x20265/_old 2009-06-12 16:14:22.000000000 +0200 +++ /var/tmp/diff_new_pack.x20265/_new 2009-06-12 16:14:22.000000000 +0200 @@ -27,7 +27,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 40 +Release: 41 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -337,7 +337,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 488 +Release: 489 # bug437293 %ifarch ppc64 Obsoletes: popt-64bit @@ -365,7 +365,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 488 +Release: 489 Requires: popt = 1.7 Requires: glibc-devel # bug437293 @@ -405,6 +405,8 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Tue Jun 09 2009 mmarek@suse.cz +- findksyms.diff: also generate provides for kernel packages. * Mon Apr 06 2009 ro@suse.de - fix typo in brp-symlink (bnc#457908) * Tue Mar 31 2009 mmarek@suse.cz ++++++ findksyms.diff ++++++ --- /var/tmp/diff_new_pack.x20265/_old 2009-06-12 16:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.x20265/_new 2009-06-12 16:14:23.000000000 +0200 @@ -1,15 +1,13 @@ SUSE specific kernel provides/requires scripts --- - scripts/find-provides.ksyms | 23 +++++++++++++++++ - scripts/find-requires.ksyms | 59 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 82 insertions(+) + scripts/find-provides.ksyms | 41 +++++++++++++++++++++++++++++++ + scripts/find-requires.ksyms | 57 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 98 insertions(+) -Index: scripts/find-provides.ksyms -=================================================================== --- /dev/null +++ scripts/find-provides.ksyms -@@ -0,0 +1,23 @@ +@@ -0,0 +1,41 @@ +#! /bin/sh + +IFS=$'\n' @@ -17,24 +15,40 @@ +case "$1" in +kernel-module-*) ;; # Fedora kernel module package names start with + # kernel-module. -+kernel*) is_kernel_package=1 ;; ++kernel*) kernel_flavor=${1#kernel-} ;; +esac + -+if ! [ -z "$is_kernel_package" ]; then -+ cat > /dev/null -+ exit 0 -+fi -+ -+for module in $(grep -E '/lib/modules/.+\.ko$'); do -+ flavor=$(/sbin/modinfo -F vermagic "$module") ++trap 'rm -f "$tmp"' EXIT ++tmp=$(mktemp) ++while read f; do ++ test -e "$f" || continue ++ case "$f" in ++ *.debug) ++ continue ++ ;; ++ */lib/modules/*/*.ko | */lib/modules/*/*.ko.gz | */boot/vmlinu[xz]*) ++ ;; ++ *) ++ continue ++ esac ++ unzip=false ++ case "$f" in ++ *.gz | */boot/vmlinuz*) ++ unzip=true ++ esac ++ if $unzip && gzip -cd "$f" >"$tmp"; then ++ f=$tmp ++ fi ++ flavor=$(/sbin/modinfo -F vermagic "$f") + flavor=${flavor%% *} + flavor=${flavor##*-} -+ nm "$module" \ ++ if test -z "$flavor"; then ++ flavor=$kernel_flavor ++ fi ++ nm "$f" \ + | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p" +done \ +| sort -u -Index: scripts/find-requires.ksyms -=================================================================== --- /dev/null +++ scripts/find-requires.ksyms @@ -0,0 +1,57 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org