diff --git a/debugsource-package.diff b/debugsource-package.diff index 6d5b16a..c7839f4 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 0 -maxdepth 1 | \ ++find ${debugdir} -mindepth 1 -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 0 -maxdepth 1 | \ ++find ${debugsrcdir} -mindepth 1 -maxdepth 1 | \ + sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTSOURCE diff --git a/rpm-python.spec b/rpm-python.spec index e4f63eb..63fcc24 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: 227 +Release: 228 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.changes b/rpm.changes index 5ce45ec..ea2f495 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 9 23:15:48 CEST 2008 - mrueckert@suse.de + +- revert the last change as it leads to duplicated entries in the + file list + ------------------------------------------------------------------- Wed Apr 9 21:00:30 CEST 2008 - jblunck@suse.de diff --git a/rpm.spec b/rpm.spec index 36b19f9..26dbceb 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: 185 +Release: 186 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: 413 +Release: 414 # %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: 413 +Release: 414 Requires: popt = 1.7 Requires: glibc-devel @@ -410,6 +410,9 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Thu Apr 10 2008 mrueckert@suse.de +- revert the last change as it leads to duplicated entries in the + file list * Wed Apr 09 2008 jblunck@suse.de - Fix a bug in last commit that leads to /usr/src/debug not belonging to any package.