From 8f9b9d3c82ed5ff42c2ecb9ccce9b5cfa2699ee97779942bda0b4bc351b39f08 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 28 Nov 2008 13:34:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=64 --- finddebuginfo-absolute-links.diff | 21 ++++++++++++++++----- modalias-kernel_module.diff | 4 ++-- modalias.diff | 19 ++++++++++++++++--- rpm-python.spec | 2 +- rpm.changes | 13 +++++++++++++ rpm.spec | 16 ++++++++++++---- rpmrc.diff | 2 +- specfilemacro.diff | 10 ++++++++++ 8 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 specfilemacro.diff diff --git a/finddebuginfo-absolute-links.diff b/finddebuginfo-absolute-links.diff index 381b58e..da28ce1 100644 --- a/finddebuginfo-absolute-links.diff +++ b/finddebuginfo-absolute-links.diff @@ -7,13 +7,13 @@ behavior to reflect that policy. Signed-off-by: Jan Blunck --- - scripts/find-debuginfo.sh | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) + scripts/find-debuginfo.sh | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) -Index: scripts/find-debuginfo.sh +Index: b/scripts/find-debuginfo.sh =================================================================== ---- scripts/find-debuginfo.sh.orig -+++ scripts/find-debuginfo.sh +--- a/scripts/find-debuginfo.sh ++++ b/scripts/find-debuginfo.sh @@ -123,7 +123,17 @@ debug_link() local l="/usr/lib/debug$2" local t="$1" @@ -33,3 +33,14 @@ Index: scripts/find-debuginfo.sh } # Compare two binaries but ignore the .note.gnu.build-id section +@@ -157,8 +167,8 @@ make_id_link() + + local other=$(readlink -m "$root_idfile") + other=${other#$RPM_BUILD_ROOT} +- if cmp -s "$root_idfile" "$RPM_BUILD_ROOT$file" || +- elfcmp "$root_idfile" "$RPM_BUILD_ROOT$file" ; then ++ if cmp -s "$RPM_BUILD_ROOT$other" "$RPM_BUILD_ROOT$file" || ++ elfcmp "$RPM_BUILD_ROOT$other" "$RPM_BUILD_ROOT$file" ; then + # Two copies. Maybe one has to be setuid or something. + echo >&2 "*** WARNING: identical binaries are copied, not linked:" + echo >&2 " $file" diff --git a/modalias-kernel_module.diff b/modalias-kernel_module.diff index ddee61d..293c6f9 100644 --- a/modalias-kernel_module.diff +++ b/modalias-kernel_module.diff @@ -3,7 +3,7 @@ @@ -1,6 +1,8 @@ #! /bin/sh -+RPM_SOURCE_DIR=/usr/src/packages/SOURCES ++SPECFILE=${RPMBUILD_SPECFILE:-/usr/src/packages/SOURCES/$1.spec} IFS=$'\n' +PACKAGE=$1 @@ -44,7 +44,7 @@ + regex=$( + set -o noglob + set -- $(sed -ne 's:^%supplements_kernel_module[ \t]::p' \ -+ $RPM_SOURCE_DIR/$1.spec) ++ $SPECFILE) + while [ $# -ge 1 ]; do + regex=$(echo "$1" \ + | sed -e 's:[.]:\\.:g' \ diff --git a/modalias.diff b/modalias.diff index bba9fae..88f2b35 100644 --- a/modalias.diff +++ b/modalias.diff @@ -4,12 +4,25 @@ Index: macros.in =================================================================== --- macros.in.orig +++ macros.in -@@ -440,7 +440,7 @@ print (t)\ - %__find_requires @RPMCONFIGDIR@/find-requires %name +@@ -433,14 +433,18 @@ print (t)\ + # + # Path to scripts to autogenerate package dependencies, + # ++%__set_helper_env %{lua: ++posix.setenv("RPMBUILD_SPECFILE",rpm.expand("%?_specfile")); ++posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir")); ++} + # Note: Used iff _use_internal_dependency_generator is zero. + #%__find_provides @RPMCONFIGDIR@/rpmdeps --provides + #%__find_requires @RPMCONFIGDIR@/rpmdeps --requires +-%__find_provides @RPMCONFIGDIR@/find-provides %name +-%__find_requires @RPMCONFIGDIR@/find-requires %name ++%__find_provides %{__set_helper_env}@RPMCONFIGDIR@/find-provides %name ++%__find_requires %{__set_helper_env}@RPMCONFIGDIR@/find-requires %name #%__find_conflicts ??? #%__find_obsoletes ??? -#%__find_supplements ??? -+%__find_supplements @RPMCONFIGDIR@/find-supplements %name ++%__find_supplements %{__set_helper_env}@RPMCONFIGDIR@/find-supplements %name #%__find_enhances ??? # diff --git a/rpm-python.spec b/rpm-python.spec index 11b946b..86f6c07 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: 16 +Release: 17 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.changes b/rpm.changes index ce7f03f..c456b47 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Nov 27 11:37:30 CET 2008 - mls@suse.de + +- remove '-m64' from ppc64 optflags [bnc#447002] +- add _specfile macro +- set RPMBUILD_ env vars for file helpers +- make find-supplements.ksyms use RPMBUILD_SPECFILE [bnc#443815] + +------------------------------------------------------------------- +Tue Nov 25 17:10:40 CET 2008 - jblunck@suse.de + +- find-debuginfo.sh: fix for handling absolute symlinks + ------------------------------------------------------------------- Fri Nov 21 16:30:19 CET 2008 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index e3c8d9e..18c7e23 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: 16 +Release: 17 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -95,6 +95,7 @@ Patch61: debugedit-canon-fix.diff Patch62: fingerprint.diff Patch63: finddebuginfo-absolute-links.diff Patch64: firmware.diff +Patch65: specfilemacro.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -178,7 +179,7 @@ rm -f rpmdb/db.h %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 -%patch -P 60 -P 61 -P 62 -P 63 -P 64 +%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms chmod 755 scripts/firmware.prov @@ -328,7 +329,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 464 +Release: 465 # %description -n popt @@ -351,7 +352,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 464 +Release: 465 Requires: popt = 1.7 Requires: glibc-devel @@ -386,6 +387,13 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Thu Nov 27 2008 mls@suse.de +- remove '-m64' from ppc64 optflags [bnc#447002] +- add _specfile macro +- set RPMBUILD_ env vars for file helpers +- make find-supplements.ksyms use RPMBUILD_SPECFILE [bnc#443815] +* Tue Nov 25 2008 jblunck@suse.de +- find-debuginfo.sh: fix for handling absolute symlinks * Fri Nov 21 2008 mls@suse.de - add firmware.prov provides helper * Fri Nov 21 2008 mmarek@suse.cz diff --git a/rpmrc.diff b/rpmrc.diff index fe9a5fe..4b6dedc 100644 --- a/rpmrc.diff +++ b/rpmrc.diff @@ -47,7 +47,7 @@ Index: rpmrc.in +optflags: ppc32dy4 -O2 -g -m32 +optflags: ppciseries -O2 -g -m32 +optflags: ppcpseries -O2 -g -m32 -+optflags: ppc64 -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables ++optflags: ppc64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables optflags: parisc -O2 -g -mpa-risc-1-0 +optflags: hppa -O2 -g -mpa-risc-1-0 diff --git a/specfilemacro.diff b/specfilemacro.diff new file mode 100644 index 0000000..cac5b0a --- /dev/null +++ b/specfilemacro.diff @@ -0,0 +1,10 @@ +--- build/parseSpec.c.orig 2008-11-27 11:41:51.000000000 +0100 ++++ build/parseSpec.c 2008-11-27 11:43:00.000000000 +0100 +@@ -475,6 +475,7 @@ + * /.././../usr/../bin//./sh (XXX FIXME: dots not handled yet) + */ + spec->specFile = rpmGetPath(specFile, NULL); ++ addMacro(spec->macros, "_specfile", NULL, spec->specFile, RMIL_SPEC); + spec->fileStack = newOpenFileInfo(); + spec->fileStack->fileName = xstrdup(spec->specFile); + if (buildRootURL) {