Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Thu Jan 8 14:33:27 CET 2009. -------- --- rpm/rpm.changes 2008-12-19 15:27:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2009-01-05 15:38:11.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 5 15:37:07 CET 2009 - mmarek@suse.cz + +- findksyms.diff: make sure that the input files for join are + sorted properly (bnc#450714) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.Kc9927/_old 2009-01-08 14:33:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Kc9927/_new 2009-01-08 14:33:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpm-python (Version 4.4.2.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 22 +Release: 23 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.Kc9927/_old 2009-01-08 14:33:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Kc9927/_new 2009-01-08 14:33:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpm (Version 4.4.2.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 22 +Release: 23 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -331,7 +331,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 470 +Release: 471 # %description -n popt @@ -354,7 +354,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 470 +Release: 471 Requires: popt = 1.7 Requires: glibc-devel @@ -389,6 +389,9 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Mon Jan 05 2009 mmarek@suse.cz +- findksyms.diff: make sure that the input files for join are + sorted properly (bnc#450714) * Fri Dec 19 2008 mls@suse.de - add popt-devel and rpm-devel to baselibs config (bnc#445037) * Thu Dec 11 2008 ro@suse.de ++++++ findksyms.diff ++++++ --- /var/tmp/diff_new_pack.Kc9927/_old 2009-01-08 14:33:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Kc9927/_new 2009-01-08 14:33:05.000000000 +0100 @@ -1,7 +1,10 @@ SUSE specific kernel provides/requires scripts -Index: scripts/find-provides.ksyms -=================================================================== +--- + scripts/find-provides.ksyms | 23 +++++++++++++++++ + scripts/find-requires.ksyms | 59 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 82 insertions(+) + --- /dev/null +++ scripts/find-provides.ksyms @@ -0,0 +1,23 @@ @@ -28,8 +31,6 @@ + | 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,59 @@ @@ -48,7 +49,7 @@ + nm "$module" + done \ + | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):\1\t\2:p' \ -+ | sort -k2 -u ++ | sort -t $'\t' -k2 -u +} + +all_requires() { @@ -59,7 +60,7 @@ + | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':' + fi + done \ -+ | sort -k2 -u ++ | sort -t $'\t' -k2 -u +} + +if ! [ -z "$is_kernel_package" -a -e /sbin/modinfo -a -e /sbin/modprobe ]; then @@ -70,7 +71,7 @@ +modules=($(grep -E '/lib/modules/.+\.ko$')) +if [ ${#modules[@]} -gt 0 ]; then + symset_table=$(mktemp -t ${0##*/}.XXXXX) -+ /usr/lib/rpm/symset-table | sort > $symset_table ++ /usr/lib/rpm/symset-table | sort -t $'\t' -k 1,1 > $symset_table + + join -t $'\t' -j 1 -a 2 $symset_table <( + # Filter out requirements that we fulfill ourself. @@ -81,7 +82,7 @@ + BEGIN { FS = "\t" ; OFS = "\t" } + { print $3 "/" $2 "/" $1 } + ' \ -+ | sort -u) \ ++ | sort -t $'\t' -k 1,1 -u) \ + | sort -u \ + | awk ' + { FS = "\t" ; OFS = "\t" } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org