- fix: add %%ifnarch noarch to debug_package macro

CVS patchset: 5938
CVS date: 2002/12/12 19:21:50

diff --git a/CHANGES b/CHANGES
index ff8cf27..883fd85 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -44,6 +44,7 @@
        - don't generate dependencies unless execute bit is set.
        - enable internal automagic dependency generation as default.
        - fix: add rpmlib(VersionedDependencies) if versioned Provides: found.
+       - fix: add %%ifnarch noarch to debug_package macro.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/macros.in b/macros.in
index 0be342c..862d608 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.129 2002/12/09 17:22:55 jbj Exp $
+# $Id: macros.in,v 1.130 2002/12/12 19:21:50 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -116,16 +116,18 @@
 
 #      Template for debug information sub-package.
 %debug_package \
+%ifnarch noarch\
 %global __debug_package 1\
-%package debug \
-Summary: Debug information for package %{name} \
-Group: Development/Debug \
-%description debug \
-This package provides debug information for package %{name}. \
-Debug information is useful when developing applications that use this \
-package or when debugging this package. \
-%files debug -f debugfiles.list \
-%defattr(-,root,root)  \
+%package debug\
+Summary: Debug information for package %{name}\
+Group: Development/Debug\
+%description debug\
+This package provides debug information for package %{name}.\
+Debug information is useful when developing applications that use this\
+package or when debugging this package.\
+%files debug -f debugfiles.list\
+%defattr(-,root,root)\
+%endif\
 %{nil}
 
 %_defaultdocdir                %{_usr}/doc

diff --git a/rpm.spec.in b/rpm.spec.in
index 566830d..f1495b6 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -461,6 +461,7 @@ exit 0
 %changelog
 * Thu Dec 12 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.23
 - fix: add rpmlib(VersionedDependencies) if versioned Provides: found.
+- fix: add %%ifnarch noarch to debug_package macro.
 
 * Wed Dec 11 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.22
 - rebuild against glibc with TLS support.