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

debugedit-comp-dir.diff

@@ -0,0 +1,57 @@
+Include compilation directory in source file list if used.
+
+---
+ tools/debugedit.c |   28 +++++++++++++++++++++++++++-
+ 1 file changed, 27 insertions(+), 1 deletion(-)
+
+--- tools/debugedit.c.orig	2007-04-08 22:55:58.000000000 +0200
++++ tools/debugedit.c	2007-04-09 01:34:51.000000000 +0200
+@@ -488,6 +488,7 @@ edit_dwarf2_line (DSO *dso, uint_32 off,
+   uint_32 value, dirt_cnt;
+   size_t comp_dir_len = strlen (comp_dir);
+   size_t abs_file_cnt = 0, abs_dir_cnt = 0;
++  int comp_dir_used = 0;
+ 
+   if (phase != 0)
+     return 0;
+@@ -586,6 +587,7 @@ edit_dwarf2_line (DSO *dso, uint_32 off,
+ 	}
+       else
+ 	{
++	  comp_dir_used = 1;
+ 	  memcpy (s, comp_dir, comp_dir_len);
+ 	  s[comp_dir_len] = '/';
+ 	  memcpy (s + comp_dir_len + 1, dirt[value], dir_len);
+@@ -624,7 +626,31 @@ edit_dwarf2_line (DSO *dso, uint_32 off,
+       read_uleb128 (ptr);
+     }
+   ++ptr;
+-  
++
++  if (comp_dir_used && list_file_fd != -1
++      && (base_dir == NULL || has_prefix (comp_dir, base_dir)))
++    {
++      char *p;
++      size_t size;
++      ssize_t ret;
++
++      size = comp_dir_len + 1;
++      p = comp_dir;
++      if (base_dir)
++	{
++	  p += strlen (base_dir);
++	  size -= strlen (base_dir);
++	}
++      while (size > 0)
++	{
++	  ret = write (list_file_fd, p, size);
++	  if (ret == -1)
++	    break;
++	  size -= ret;
++	  p += ret;
++	}
++    }
++
+   if (dest_dir)
+     {
+       unsigned char *srcptr, *buf = NULL;

rpm-python.spec

@@ -16,7 +16,7 @@ License:        GNU General Public License (GPL)
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        101
+Release:        104
 Requires:       rpm = %{version}
 
 %py_requires

rpm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Apr  8 23:22:12 CEST 2007 - schwab@suse.de
+
+- Include compilation directory in debuginfo file list.
+
 -------------------------------------------------------------------
 Sat Mar 24 12:22:23 CET 2007 - ro@suse.de
 

rpm.spec

@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq popt = %{popt_version} permission
 Autoreqprov:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        95
+Release:        97
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -120,6 +120,7 @@ Patch90:        testmode.diff
 Patch91:        po-file-fixes.diff
 Patch92:        files.diff
 Patch93:        popt-to-lib.diff
+Patch94:        debugedit-comp-dir.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 
@@ -189,7 +190,7 @@ rm -f rpmdb/db.h
 %patch -P 60       -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
-%patch -P 90 -P 91 -P 92 -P 93
+%patch -P 90 -P 91 -P 92 -P 93 -P 94
 chmod 755 scripts/find-supplements{,.ksyms}
 chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 tar -xjvf %{SOURCE1}
@@ -320,7 +321,7 @@ Summary:        A C library for parsing command line parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        323
+Release:        325
 #
 
 %description -n popt
@@ -343,7 +344,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        323
+Release:        325
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -379,6 +380,8 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Sun Apr 08 2007 - schwab@suse.de
+- Include compilation directory in debuginfo file list.
 * Sat Mar 24 2007 - ro@suse.de
 - added libbz2-devel to BuildRequires and Requires for -devel
 * Fri Mar 23 2007 - dmueller@suse.de