diff --git a/macrosin.diff b/macrosin.diff index f8fb3e9..77c9962 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -16,7 +16,7 @@ Index: macros.in Group: Development/Debug\ AutoReqProv: 0\ -%description debug\ -+Requires: %{name} = %{version}-%{release}\ ++Requires: %{?!debug_package_requires:%{name} = %{version}-%{release}}%{?debug_package_requires}\ +%description debuginfo\ This package provides debug information for package %{name}.\ Debug information is useful when developing applications that use this\ diff --git a/rpm-python.spec b/rpm-python.spec index f87ed92..96ceb33 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -16,7 +16,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 141 +Release: 145 Requires: rpm = %{version} %py_requires diff --git a/rpm.changes b/rpm.changes index 3bd80bd..8344dbb 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 2 15:28:09 CEST 2007 - mls@suse.de + +- let the debug_package_requires macro overwrite the + default requires in the debuginfo package + ------------------------------------------------------------------- Tue Jul 24 13:29:10 CEST 2007 - dmueller@suse.de diff --git a/rpm.spec b/rpm.spec index 71da3b7..5b4a986 100644 --- a/rpm.spec +++ b/rpm.spec @@ -20,7 +20,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 123 +Release: 126 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -340,7 +340,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2 or later Group: System/Libraries Version: 1.7 -Release: 351 +Release: 354 # %description -n popt @@ -363,7 +363,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2 or later Group: System/Libraries Version: 1.7 -Release: 351 +Release: 354 Requires: popt = 1.7 Requires: glibc-devel @@ -399,6 +399,9 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Thu Aug 02 2007 - mls@suse.de +- let the debug_package_requires macro overwrite the + default requires in the debuginfo package * Tue Jul 24 2007 - dmueller@suse.de - hardcode rpm in patch name * Fri Jun 15 2007 - dmueller@suse.de