From 2a7ebdfb1e343ff0bed63638eb4465c48d3b279052da6e2fa676a70ad8e89d5c Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 30 Jan 2018 15:17:29 +0000
Subject: [PATCH] Accepting request 571136 from home:Andreas_Schwab:Factory

- Avoid duplicate source rpm

OBS-URL: https://build.opensuse.org/request/show/571136
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=489
---
 glibc.changes |  5 +++++
 glibc.spec    | 22 +++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/glibc.changes b/glibc.changes
index a8097d0..0c4317a 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 30 15:04:47 UTC 2018 - schwab@suse.de
+
+- Avoid duplicate source rpm
+
 -------------------------------------------------------------------
 Mon Jan 22 10:32:36 UTC 2018 - schwab@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 83d0c81..d4fcca1 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -26,10 +26,10 @@
 
 %define flavor @BUILD_FLAVOR@%{nil}
 
-%bcond_with all
+%bcond_with build_all
 %define build_main 1
-%define build_utils %{with all}
-%define build_testsuite %{with all}
+%define build_utils %{with build_all}
+%define build_testsuite %{with build_all}
 %if "%flavor" == "utils"
 %if %{with ringdisabled}
 ExclusiveArch:  do_not_build
@@ -47,7 +47,11 @@ ExclusiveArch:  do_not_build
 %define build_testsuite 1
 %endif
 
+%if %{build_main}
 Name:           glibc
+%else
+Name:           glibc-%{flavor}-src
+%endif
 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
@@ -83,7 +87,7 @@ BuildArch:      i686
 %define build_locales 1
 %define build_html 0
 %else
-%if %{with fast_build} || %{build_utils} && %{without all}
+%if %{with fast_build} || %{build_utils} && %{without build_all}
 %define build_profile 0
 %define build_locales 0
 %define build_html 0
@@ -359,25 +363,25 @@ 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.
 
-%package utils
+%package -n glibc-utils
 Summary:        Development utilities from the GNU C Library
 License:        LGPL-2.1+
 Group:          Development/Languages/C and C++
 Requires:       glibc = %{version}
 
-%description utils
+%description -n glibc-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.
 
-%package testsuite
+%package -n glibc-testsuite
 Summary:        Testsuite results from the GNU C Library
 License:        LGPL-2.1+
 Group:          Development/Languages/C and C++
 
-%description testsuite
+%description -n glibc-testsuite
 This package contains the testsuite results from the GNU C Library.
 
 %if %{build_main}
@@ -1431,7 +1435,7 @@ exit 0
 %endif # main
 
 %if %{build_utils}
-%files utils
+%files -n glibc-utils
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
 /%{_lib}/libpcprofile.so