Accepting request 510863 from home:Andreas_Schwab:Factory

Reorganize specfile

OBS-URL: https://build.opensuse.org/request/show/510863
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=460

_multibuild

@@ -1,5 +0,0 @@
-<multibuild>
-  <package>i686</package>
-  <package>utils</package>
-  <package>testsuite</package>
-</multibuild>

glibc.spec

@@ -23,16 +23,18 @@
 %define crypt_bf_version 1.3
 %define build_snapshot 0
 
+%define flavor %{nil}
+
 %bcond_with all
 %define build_main 1
 %define build_utils %{with all}
 %define build_testsuite %{with all}
-%if "@BUILD_FLAVOR@" == "utils"
+%if "%flavor" == "utils"
 %define build_main 0
 %define build_utils 1
 %define build_testsuite 0
 %endif
-%if "@BUILD_FLAVOR@" == "testsuite"
+%if "%flavor" == "testsuite"
 %define build_main 0
 %define build_utils 0
 %define build_testsuite 1
@@ -60,7 +62,7 @@ BuildRequires:  python-pexpect
 %if %{build_utils}
 BuildRequires:  gd-devel
 %endif
-%if "@BUILD_FLAVOR@" == "i686"
+%if "%flavor" == "i686"
 ExclusiveArch:  i586 i686
 BuildArch:      i686
 %global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic

pre_checkin.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+for flavor in -utils -testsuite .i686; do
+  sed "/^%define flavor/s/%{nil}/${flavor#?}/" glibc.spec > glibc$flavor.spec
+done