- Revert to singlespec multibuild.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=355

_multibuild

@@ -1,3 +1,3 @@
 <multibuild>
-  <package>gdb-testresults</package>
+  <package>testsuite</package>
 </multibuild>

gdb.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  7 07:48:58 UTC 2023 - Tom de Vries <tdevries@suse.com>
+
+- Revert to singlespec multibuild.
+
 -------------------------------------------------------------------
 Tue Apr  4 13:27:03 UTC 2023 - Tom de Vries <tdevries@suse.com>
 

gdb.spec

@@ -17,7 +17,7 @@
 #
 
 
-%define flavor %{nil}
+%define flavor @BUILD_FLAVOR@%{nil}
 
 %bcond_with ringdisabled
 %bcond_with for_chroot
@@ -144,7 +144,6 @@ Source16:       qa.sh
 Source17:       qa-local.sh
 Source18:       qa-remote.sh
 Source19:       README.qa
-Source20:       pre_checkin.sh
 
 %if %{build_testsuite}
 NoSource:       0
@@ -163,7 +162,6 @@ NoSource:       16
 NoSource:       17
 NoSource:       18
 NoSource:       19
-NoSource:       20
 %endif
 
 # Fedora import from branch f36, commit 89947a7 "Rebase to FSF GDB 12.1."

pre_checkin.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-for flavor in %{nil} testsuite; do
-    case $flavor in
-	%{nil})
-	    file=gdb.spec
-	    ;;
-	testsuite)
-	    file=gdb-testresults.spec
-	    ;;
-	*)
-	    echo "unknown flavor: $flavor"
-	    ;;
-	esac
-
-    sed "s/^%define flavor .*$/%define flavor $flavor/" gdb.spec.in > $file
-done
-
-osc service localrun format_spec_file
-
-diff -I "^%define flavor " gdb.spec.in gdb.spec
-
-diff -I "^%define flavor " gdb.spec.in gdb-testresults.spec

qa-local.sh

@@ -106,7 +106,6 @@ case "$n" in
 		    --trust-all-projects \
 		    --no-service \
 		    $c $arch \
-		    gdb.spec \
 		    > $logs/$n/LOG.$c.$arch \
 		    2>&1
 
@@ -140,7 +139,7 @@ case "$n" in
 		    --no-service \
 		    -k $pkgs/$c.$arch \
 		    $c $arch \
-		    gdb-testressults.spec \
+		    -M testsuite \
 		    > $logs/$n/LOG.$c.$arch \
 		    2>&1
 		if [ $? -eq 0 ]; then