OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=61

finddebuginfo-absolute-links.diff

@@ -0,0 +1,35 @@
+From: Jan Blunck <jblunck@suse.de>
+Subject: Do the symbolic links right in the first place
+
+Since brp-symlink relinks symbolic links to enforce a certain policy we should
+do it right in the first place. So this patch changes find-debuginfo.sh scripts
+behavior to reflect that policy.
+
+Signed-off-by: Jan Blunck <jblunck@suse.de>
+---
+ scripts/find-debuginfo.sh |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+Index: scripts/find-debuginfo.sh
+===================================================================
+--- scripts/find-debuginfo.sh.orig
++++ scripts/find-debuginfo.sh
+@@ -123,7 +123,17 @@ debug_link()
+   local l="/usr/lib/debug$2"
+   local t="$1"
+   echo >> "$LINKSFILE" "$l $t"
+-  link_relative "$t" "$l" "$RPM_BUILD_ROOT"
++
++  # this should correspond to what brp-symlink is doing
++  case $t in
++      /usr*)
++	  link_relative "$t" "$l" "$RPM_BUILD_ROOT"
++	  ;;
++      *)
++	  mkdir -p "$(dirname "$RPM_BUILD_ROOT$l")" && \
++	      ln -snf "$t" "$RPM_BUILD_ROOT$l"
++	  ;;
++  esac
+ }
+ 
+ # Compare two binaries but ignore the .note.gnu.build-id section

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:        12
+Release:        14
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec

rpm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 18 17:46:53 CET 2008 - jblunck@suse.de
+
+- find-debuginfo.sh: Create symlinks reflecting the policy from brp-symlink
+
 -------------------------------------------------------------------
 Thu Nov 13 18:16:14 CET 2008 - agruen@suse.de
 

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:        12
+Release:        14
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -93,6 +93,7 @@ Patch59:        requires-ge-macro.diff
 Patch60:        mimetype.diff
 Patch61:        debugedit-canon-fix.diff
 Patch62:        fingerprint.diff
+Patch63:        finddebuginfo-absolute-links.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -176,7 +177,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
+%patch -P 60 -P 61 -P 62 -P 63
 chmod 755 scripts/find-supplements{,.ksyms}
 chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 tar -xjvf %{SOURCE1}
@@ -324,7 +325,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        460
+Release:        462
 #
 
 %description -n popt
@@ -347,7 +348,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        460
+Release:        462
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -382,6 +383,8 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Tue Nov 18 2008 jblunck@suse.de
+- find-debuginfo.sh: Create symlinks reflecting the policy from brp-symlink
 * Thu Nov 13 2008 agruen@suse.de
 - Fix the ksym(...) provides to also include the kernel flavor
   (bnc#444698).