From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 8 Jun 2009 22:38:17 +0000 (+0000)
Subject: - edit listfile earlier
X-Git-Tag: auto/th/rpm-4_5-48~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=be922a9330c2e916a4dd280f776b3c23e1555746

- edit listfile earlier

Changed files:
    rpm-debugdir.patch -> 1.2
---

diff --git a/rpm-debugdir.patch b/rpm-debugdir.patch
index c7040e6..ff534f7 100644
--- a/rpm-debugdir.patch
+++ b/rpm-debugdir.patch
@@ -1,10 +1,12 @@
 --- rpm-4.5/scripts/find-debuginfo.sh~	2009-06-08 23:57:15.000000000 +0300
 +++ rpm-4.5/scripts/find-debuginfo.sh	2009-06-09 00:10:21.603343056 +0300
-@@ -333,4 +333,7 @@
-   sed -n -f "${LISTFILE}.dirs.sed" "${LISTFILE}" | sort -u > "${LISTFILE}.new"
-   cat "$LISTFILE" >> "${LISTFILE}.new"
-   mv "${LISTFILE}.new" "$LISTFILE"
+@@ -306,6 +306,9 @@
+   sed -n -r "\#^$ptn #s/ .*\$//p" "$LINKSFILE" | append_uniq "$out"
+ }
+ 
++# get rid of top level dir, we want it be only in filesystem-debuginfo package
++sed -i -e '/^%dir \/usr\/lib\/debug$/d' "$LISTFILE"
 +
-+  # get rid of top level dir, we want it be only in filesystem-debuginfo package
-+  sed -i -e '/^%dir \/usr\/lib\/debug$/d' "$LISTFILE"
- fi
+ #
+ # When given multiple -o switches, split up the output as directed.
+ #