- simplify debug package code so that it also works with --target
authorMichael Schroeder <mls@suse.de>
Tue, 5 Jun 2012 12:32:06 +0000 (14:32 +0200)
committerMichael Schroeder <mls@suse.de>
Tue, 5 Jun 2012 12:32:06 +0000 (14:32 +0200)
build

diff --git a/build b/build
index ad81c23..8fda394 100755 (executable)
--- a/build
+++ b/build
@@ -1947,10 +1947,9 @@ for SPECFILE in "${SPECFILES[@]}" ; do
            echo '
 %prep %{?!_suse_insert_debug_package_seen:%?_suse_insert_debug_package}%%prep
 %package %{?!_suse_insert_debug_package_seen:%?_suse_insert_debug_package}%%package
-%suse_insert_debug_package \
-  %global _suse_insert_debug_package \\\
-    %%global _suse_insert_debug_package_seen 1 \\\
-    %%debug_package
+%_suse_insert_debug_package \
+  %global _suse_insert_debug_package_seen 1 \
+  %debug_package
 
 ' >> $BUILD_ROOT/root/.rpmmacros
        fi
@@ -2092,10 +2091,6 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                rpmbopts[${#rpmbopts[@]}]='--eval'
                rpmbopts[${#rpmbopts[@]}]="%undefine _enable_debug_packages"
        fi
-       if [ -n "$BUILD_DEBUG" ]; then
-               rpmbopts[${#rpmbopts[@]}]='--eval'
-               rpmbopts[${#rpmbopts[@]}]="%suse_insert_debug_package"
-       fi
        if [ -n "$RSYNCDONE" ] ; then
                rpmbopts[${#rpmbopts[@]}]='--define'
                rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1"