- use __debug_package instead of _suse_insert_debug_package_seen, always undef _enabl...

diff --git a/build b/build
index b055e73..1a67b1e 100755 (executable)
--- a/build
+++ b/build
@@ -1948,10 +1948,11 @@ for SPECFILE in "${SPECFILES[@]}" ; do
        getmacros --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$CONFIG_DIR" > $BUILD_ROOT/root/.rpmmacros
        if test -n "$BUILD_DEBUG" ; then
            echo '
-%prep %{?!_suse_insert_debug_package_seen:%?_suse_insert_debug_package}%%prep
-%package %{?!_suse_insert_debug_package_seen:%?_suse_insert_debug_package}%%package
+%prep %{?!__debug_package:%?_suse_insert_debug_package}%%prep
+%package %{?!__debug_package:%?_suse_insert_debug_package}%%package
 %_suse_insert_debug_package \
-  %global _suse_insert_debug_package_seen 1 \
+  %global __debug_package 1 \
+  %undefine _enable_debug_packages \
   %debug_package
 
 ' >> $BUILD_ROOT/root/.rpmmacros
@@ -2090,10 +2091,6 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                rpmbopts[${#rpmbopts[@]}]='--define'
                rpmbopts[${#rpmbopts[@]}]="disturl $DISTURL"
        fi
-       if test -s "$BUILD_ROOT/usr/lib/rpm/mandriva/macros" ; then
-               rpmbopts[${#rpmbopts[@]}]='--eval'
-               rpmbopts[${#rpmbopts[@]}]="%undefine _enable_debug_packages"
-       fi
        if [ -n "$RSYNCDONE" ] ; then
                rpmbopts[${#rpmbopts[@]}]='--define'
                rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1"