rpms/rpm/devel rpm-4.4.2.1-debuginfo-names.patch, 1.2, 1.3 rpm.spec, 1.255, 1.256

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12535

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2.1-debuginfo-names.patch 
Log Message:
- add back accidentally dropped debugedit patch until upstreamed
- add a bunch of previously implicit dependencies for rpm-build


rpm-4.4.2.1-debuginfo-names.patch:

Index: rpm-4.4.2.1-debuginfo-names.patch
===================================================================
RCS file: rpm-4.4.2.1-debuginfo-names.patch
diff -N rpm-4.4.2.1-debuginfo-names.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpm-4.4.2.1-debuginfo-names.patch	4 Sep 2007 06:11:33 -0000	1.3
@@ -0,0 +1,60 @@
+From roland at redhat.com Sun Aug 12 15:45:49 2007
+Date: Sun, 12 Aug 2007 05:45:16 -0700 (PDT)
+From: Roland McGrath <roland at redhat.com>
+To: Panu Matilainen <pmatilai at redhat.com>
+Cc: Paul Nasrat <pnasrat at redhat.com>
+Subject: Re: debugedit.c goof
+
+> No need, already applied upstream HEAD, 4.4.x branch and rawhide build 
+> with the fix triggered.
+
+Too quick!  I have another fix. ;-)
+
+This one is less trivial, and not tested.  It should make it put names in
+the -l file when they match the edit replace directory name as well as the
+edit match directory name, the point being that it emits the same names
+when run twice in a row.
+
+Thanks,
+Roland
+
+
+diff -r fb1ee4c438c9 tools/debugedit.c
+--- a/tools/debugedit.c	Sun Aug 12 15:27:46 2007 +0300
++++ b/tools/debugedit.c	Sun Aug 12 05:42:13 2007 -0700
+@@ -567,23 +567,22 @@ edit_dwarf2_line (DSO *dso, uint_32 off,
+ 	  memcpy (s + comp_dir_len + 1 + dir_len + 1, file, file_len + 1);
+ 	}
+       canonicalize_path (s, s);
+-      if (base_dir == NULL ||
+-	  has_prefix (s, base_dir))
+-	{
+-	  char *p;
+-	  size_t size;
+-	  ssize_t ret;
+-	  if (base_dir)
++      if (list_file_fd != -1)
++	{
++	  char *p = NULL;
++	  if (base_dir == NULL)
++	    p = s;
++	  else if (has_prefix (s, base_dir))
+ 	    p = s + strlen (base_dir);
+-	  else
+-	    p = s;
+-	  
+-	  if (list_file_fd != -1)
++	  else if (has_prefix (s, dest_dir))
++	    p = s + strlen (dest_dir);
++
++	  if (p)
+ 	    {
+-	      size = strlen (p) + 1;
++	      size_t size = strlen (p) + 1;
+ 	      while (size > 0)
+ 		{
+-		  ret = write (list_file_fd, p, size);
++		  ssize_t ret = write (list_file_fd, p, size);
+ 		  if (ret == -1)
+ 		    break;
+ 		  size -= ret;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- rpm.spec	28 Aug 2007 10:14:29 -0000	1.255
+++ rpm.spec	4 Sep 2007 06:11:33 -0000	1.256
@@ -6,7 +6,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.2
-Release: 0.1.rc1
+Release: 0.2.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: %{name}-%{version}-rc1.tar.gz
@@ -17,6 +17,7 @@
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
 Patch7: rpm-4.4.2.1-no-popt.patch
+Patch8: rpm-4.4.2.1-debuginfo-names.patch
 
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
@@ -97,9 +98,10 @@
 %package build
 Summary: Scripts and executable programs used to build packages
 Group: Development/Tools
-Requires: rpm = %{version}-%{release}, patch >= 2.5, file
-Requires: elfutils >= 0.128
-Requires: findutils
+Requires: rpm = %{version}-%{release}
+Requires: elfutils >= 0.128 binutils
+Requires: findutils sed grep awk diffutils file patch >= 2.5
+Requires: zip gzip bzip2 cpio
 
 %description build
 The rpm-build package contains the scripts and executable programs
@@ -138,6 +140,7 @@
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
 %patch7 -p1 -b .no-popt
+%patch8 -p1 -b .debugedit-names
 
 # force external popt
 rm -rf popt/
@@ -403,6 +406,10 @@
 %endif
 
 %changelog
+* Tue Sep 04 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.2.rc1
+- add back accidentally dropped debugedit patch until upstreamed
+- add a bunch of previously implicit dependencies for rpm-build
+
 * Tue Aug 28 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-0.1.rc1
 - update to 4.4.2.2-rc1
 - remove no longer needed hacks