Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit rpm
  • From: root@xxxxxxx (h_root)
  • Date: Mon, 2 Oct 2006 12:04:19 +0200 (CEST)
  • Message-id: <20061002100419.E35C47F479@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package rpm
checked in at Mon Oct 2 12:04:19 CEST 2006.

--------
--- rpm/rpm.changes 2006-09-19 13:48:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2006-10-01 15:09:49.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Oct 1 00:05:46 CEST 2006 - agruen@xxxxxxx
+
+- Make find-*.ksyms more robust (199474).
+
+-------------------------------------------------------------------

New:
----
modalias-fix.diff
rpm-4.4.2-fix.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.6DcaSn/_old 2006-10-02 12:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.6DcaSn/_new 2006-10-02 12:03:22.000000000 +0200
@@ -17,7 +17,7 @@
Autoreqprov: on
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
-Release: 52
+Release: 53
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2

++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.6DcaSn/_old 2006-10-02 12:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.6DcaSn/_new 2006-10-02 12:03:22.000000000 +0200
@@ -20,7 +20,7 @@
Autoreqprov: on
Summary: The RPM Package Manager
Version: 4.4.2
-Release: 53
+Release: 54
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@@ -43,6 +43,8 @@
Patch6: modalias.diff
Patch7: fixes.diff
Patch8: rpm-python2.5.patch
+Patch9: rpm-4.4.2-fix.diff
+Patch10: modalias-fix.diff
#
# Source9 reserved for separate popt sources if neccessary.
# Don't use it for something else, or %prep will fail.
@@ -108,9 +110,8 @@
# %setup -q -D -T -a 9
# mv popt popt.orig
# ln -s popt-%{popt_version} popt
-%patch -P 0 -P 1 -P 2 -P 3 -P 5 -P 8
-%patch6 -p1
-%patch7 -p1
+%patch -P 0 -P 9 -P 1 -P 2 -P 3 -P 5 -P 8
+%patch -p1 -P 6 -P 10 -P 7
chmod 755 scripts/find-supplements{,.ksyms}
chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
# bunzip2 < %{SOURCE7} > po/de.po
@@ -246,7 +247,7 @@
License: LGPL, Other License(s), see package
Group: System/Libraries
Version: 1.7
-Release: 281
+Release: 282
#

%description -n popt
@@ -269,7 +270,7 @@
License: LGPL, Other License(s), see package
Group: System/Libraries
Version: 1.7
-Release: 281
+Release: 282
Requires: popt = 1.7
Requires: glibc-devel

@@ -307,6 +308,8 @@
%doc %{_mandir}/man3/popt.3*

%changelog -n rpm
+* Sun Oct 01 2006 - agruen@xxxxxxx
+- Make find-*.ksyms more robust (199474).
* Tue Sep 19 2006 - rguenther@xxxxxxx
- split rpm-python to separate spec file
- remove python-devel BuildRequires

++++++ modalias-fix.diff ++++++
From: Andreas Gruenbacher <agruen@xxxxxxx>
Subject: Make find-*.ksyms more robust

Index: rpm-4.4.2/scripts/find-supplements.ksyms
===================================================================
--- rpm-4.4.2.orig/scripts/find-supplements.ksyms
+++ rpm-4.4.2/scripts/find-supplements.ksyms
@@ -5,7 +5,7 @@ IFS=$'\n'
case "$1" in
kernel-module-*) ;; # Fedora kernel module package names start with
# kernel-module.
-kernel-*) is_kernel_package=1 ;;
+kernel*) is_kernel_package=1 ;;
esac

if ! [ -z "$is_kernel_package" ]; then
@@ -47,9 +47,9 @@ combine_modaliases() {
}

for module in $(grep -E '/lib/modules/.+\.ko$'); do
- vermagic=$(/sbin/modinfo -F vermagic $module)
+ vermagic=$(/sbin/modinfo -F vermagic "$module")
krel=${vermagic%% *}
- /sbin/modinfo -F alias $module \
+ /sbin/modinfo -F alias "$module" \
| sed -nre "s,(.+:.+),modalias(kernel-${krel##*-}:\\1),p"
done \
| sort -u \
++++++ rpm-4.4.2-fix.diff ++++++
From: Andreas Gruenbacher <agruen@xxxxxxx>
Subject: Make find-*.ksyms more robust

Index: scripts/find-provides.ksyms
===================================================================
--- scripts/find-provides.ksyms.orig
+++ scripts/find-provides.ksyms
@@ -5,7 +5,7 @@ IFS=$'\n'
case "$1" in
kernel-module-*) ;; # Fedora kernel module package names start with
# kernel-module.
-kernel-*) is_kernel_package=1 ;;
+kernel*) is_kernel_package=1 ;;
esac

if ! [ -z "$is_kernel_package" ]; then
@@ -14,7 +14,7 @@ if ! [ -z "$is_kernel_package" ]; then
fi

for module in $(grep -E '/lib/modules/.+\.ko$'); do
- nm $module \
+ nm "$module" \
| sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):ksym(\2) = \1:p'
done \
| sort -u
Index: scripts/find-requires.ksyms
===================================================================
--- scripts/find-requires.ksyms.orig
+++ scripts/find-requires.ksyms
@@ -5,11 +5,13 @@ IFS=$'\n'
case "$1" in
kernel-module-*) ;; # Fedora kernel module package names start with
# kernel-module.
-kernel-*) is_kernel_package=1 ;;
+kernel*) is_kernel_package=1 ;;
esac

all_provides() {
- nm "$@" \
+ for module in "$@"; do
+ nm "$module"
+ done \
| sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):\1\t\2:p' \
| sort -k2 -u
}







++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >