SOURCES: rpm-debuginfo.patch - fix patch chunks from bad merge

[glen]

Author: glen                         Date: Sun Apr 13 16:19:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix patch chunks from bad merge

---- Files affected:
SOURCES:
   rpm-debuginfo.patch (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SOURCES/rpm-debuginfo.patch
diff -u SOURCES/rpm-debuginfo.patch:1.18 SOURCES/rpm-debuginfo.patch:1.19
--- SOURCES/rpm-debuginfo.patch:1.18	Fri Apr  4 21:56:21 2008
+++ SOURCES/rpm-debuginfo.patch	Sun Apr 13 18:19:52 2008
@@ -1,7 +1,7 @@
 diff -ur rpm.org/macros.in rpm/macros.in
 --- rpm.org/macros.in	2007-10-02 20:31:56.905775000 +0200
 +++ rpm/macros.in	2007-10-02 20:35:30.122401828 +0200
-@@ -195,15 +195,20 @@
+@@ -195,15 +195,21 @@
  %debug_package \
  %ifnarch noarch\
  %global __debug_package 1\
@@ -26,7 +26,7 @@
  %defattr(-,root,root)\
  %endif\
  %{nil}
-@@ -1123,7 +1128,7 @@
+@@ -1123,7 +1129,7 @@
  %{?buildroot:%{__rm} -rf '%{buildroot}'}
  %__spec_install_body	%{___build_body}
  %__spec_install_post\
@@ -35,7 +35,6 @@
  %{__arch_install_post}\
  %{__os_install_post}\
  %{nil}
-diff -ur rpm.org/scripts/find-debuginfo.sh rpm/scripts/find-debuginfo.sh
 --- rpm.org/scripts/find-debuginfo.sh	2007-09-06 09:36:38.000000000 +0200
 +++ rpm/scripts/find-debuginfo.sh	2007-10-02 20:38:57.745519759 +0200
 @@ -92,7 +92,8 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-debuginfo.patch?r1=1.18&r2=1.19&f=u