Accepting request 556442 from home:Andreas_Schwab:Factory

- Add _multibuild

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

_multibuild

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

glibc-testsuite.spec.in

@@ -1,6 +0,0 @@
-%define flavor testsuite
-
-Name:           glibc-testsuite
-Summary:        Testsuite results from the GNU C Library
-License:        LGPL-2.1+
-Group:          Development/Libraries/C and C++

glibc-utils.spec.in

@@ -1,6 +0,0 @@
-%define flavor utils
-
-Name:           glibc-utils
-Summary:        Development utilities from the GNU C Library
-License:        LGPL-2.1+
-Group:          Development/Libraries/C and C++

glibc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 12 10:37:21 UTC 2017 - schwab@suse.de
+
+- Add _multibuild
+
 -------------------------------------------------------------------
 Mon Nov 27 11:11:07 UTC 2017 - schwab@suse.de
 

glibc.spec

@@ -22,35 +22,35 @@
 
 %define crypt_bf_version 1.3
 %define build_snapshot 0
+%bcond_with ringdisabled
 
-# INCLUDE glibc$flavor.spec.in
-%ifarch i686
-%define flavor i686
-%else
-%define flavor %nil
-%endif
-
-Name:           glibc
-Summary:        Standard Shared Libraries (from the GNU C Library)
-License:        LGPL-2.1+ AND SUSE-LGPL-2.1+-with-GCC-exception AND GPL-2.0+
-Group:          System/Libraries
-# END INCLUDE glibc$flavor.spec.in
+%define flavor @BUILD_FLAVOR@%{nil}
 
 %bcond_with all
 %define build_main 1
 %define build_utils %{with all}
 %define build_testsuite %{with all}
 %if "%flavor" == "utils"
+%if %{with ringdisabled}
+ExclusiveArch:  do_not_build
+%endif
 %define build_main 0
 %define build_utils 1
 %define build_testsuite 0
 %endif
 %if "%flavor" == "testsuite"
+%if %{with ringdisabled}
+ExclusiveArch:  do_not_build
+%endif
 %define build_main 0
 %define build_utils 0
 %define build_testsuite 1
 %endif
 
+Name:           glibc
+Summary:        Standard Shared Libraries (from the GNU C Library)
+License:        LGPL-2.1+ AND SUSE-LGPL-2.1+-with-GCC-exception AND GPL-2.0+
+Group:          System/Libraries
 BuildRequires:  audit-devel
 BuildRequires:  fdupes
 BuildRequires:  libcap-devel
@@ -342,22 +342,31 @@ Patch2006:      iconv-reset-input-buffer.patch
 Patch3000:      manpages.patch
 
 %description
-%if %build_main
 The GNU C Library provides the most important standard libraries used
 by nearly all programs: the standard C library, the standard math
 library, and the POSIX thread library. A system is not functional
 without these libraries.
-%endif
-%if %build_utils
+
+%package utils
+Summary:        Development utilities from the GNU C Library
+License:        LGPL-2.1+
+Group:          Development/Languages/C and C++
+Requires:       glibc = %{version}
+
+%description utils
 The glibc-utils package contains mtrace, a memory leak tracer and
 xtrace, a function call tracer which can be helpful during program
 debugging.
 
 If you are unsure if you need this, do not install this package.
-%endif
-%if %build_testsuite
+
+%package testsuite
+Summary:        Testsuite results from the GNU C Library
+License:        LGPL-2.1+
+Group:          Development/Languages/C and C++
+
+%description testsuite
 This package contains the testsuite results from the GNU C Library.
-%endif
 
 %package info
 Summary:        Info Files for the GNU C Library
@@ -1401,7 +1410,7 @@ exit 0
 %endif # main
 
 %if %{build_utils}
-%files
+%files utils
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
 /%{_lib}/libpcprofile.so

pre_checkin.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-for flavor in utils testsuite; do
-  sed -e "/^# INCLUDE /r glibc-$flavor.spec.in" \
-      -e "/^# INCLUDE /,/^# END INCLUDE /d" \
-      glibc.spec > glibc-$flavor.spec
-  cp glibc.changes glibc-$flavor.changes
-done
-osc service lr format_spec_file