From d34126f7a995507dd13227807f3f8b371fe599c9029e383f8d478dbb9947dc24 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 9 Apr 2008 19:09:43 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=39

---
 debugsource-package.diff | 4 ++--
 rpm-python.spec          | 2 +-
 rpm.changes              | 6 ++++++
 rpm.spec                 | 9 ++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debugsource-package.diff b/debugsource-package.diff
index c7839f4..6d5b16a 100644
--- a/debugsource-package.diff
+++ b/debugsource-package.diff
@@ -69,7 +69,7 @@ Index: b/scripts/find-debuginfo.sh
 +find ${debugdir} -type d -print0 | xargs -0 -r chmod 0755
 +find ${debugdir} -type f -print0 | xargs -0 -r chmod 0644
 +
-+find ${debugdir} -mindepth 1 -maxdepth 1 | \
++find ${debugdir} -mindepth 0 -maxdepth 1 | \
 +    sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE
  
 -mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug
@@ -103,5 +103,5 @@ Index: b/scripts/find-debuginfo.sh
 -  find $RPM_BUILD_ROOT/$p -type f -print0 | xargs -0 -r chmod 0644
 -  find $RPM_BUILD_ROOT/$p -type d -print0 | xargs -0 -r chmod 0755
 -done
-+find ${debugsrcdir} -mindepth 1 -maxdepth 1 | \
++find ${debugsrcdir} -mindepth 0 -maxdepth 1 | \
 +    sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTSOURCE
diff --git a/rpm-python.spec b/rpm-python.spec
index 94fe208..e4f63eb 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -17,7 +17,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        226
+Release:        227
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
diff --git a/rpm.changes b/rpm.changes
index 8ea697d..5ce45ec 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr  9 21:00:30 CEST 2008 - jblunck@suse.de
+
+- Fix a bug in last commit that leads to /usr/src/debug not belonging
+  to any package.
+
 -------------------------------------------------------------------
 Wed Apr  9 12:56:57 CEST 2008 - jblunck@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index f6037be..36b19f9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        184
+Release:        185
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -352,7 +352,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        412
+Release:        413
 #
 
 %description -n popt
@@ -375,7 +375,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        412
+Release:        413
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -411,6 +411,9 @@ Authors:
 
 %changelog
 * Wed Apr 09 2008 jblunck@suse.de
+- Fix a bug in last commit that leads to /usr/src/debug not belonging
+  to any package.
+* Wed Apr 09 2008 jblunck@suse.de
 - Put debug sources into separate -debugsource package.
 * Fri Mar 28 2008 coolo@suse.de
 - leave the rpm package itself with bzip payload to