Accepting request 510973 from home:Andreas_Schwab:Factory

Reorganize specfile

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

glibc-testsuite.head.in

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

glibc-testsuite.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package glibc
+# spec file for package glibc-testsuite
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -25,6 +25,11 @@
 
 %define flavor testsuite
 
+Name:           glibc-testsuite
+Summary:        Testsuite results from the GNU C Library
+License:        LGPL-2.1+
+Group:          Development/Languages/C and C++
+
 %bcond_with all
 %define build_main 1
 %define build_utils %{with all}
@@ -40,10 +45,6 @@
 %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
@@ -292,31 +293,22 @@ Patch2008:      reinitialize-dl_load_write_lock.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
-%package utils
+%if %build_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
-%package testsuite
+%if %build_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
@@ -1132,14 +1124,8 @@ exit 0
 %service_del_postun nscd.service
 exit 0
 
-%if %{build_main}
 %files
-#######################################################################
+%if %{build_main}
-###
-### FILES
-###
-#######################################################################
-
 # glibc
 %defattr(-,root,root)
 %doc LICENSES
@@ -1418,7 +1404,6 @@ exit 0
 %endif # main
 
 %if %{build_utils}
-%files utils
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
 /%{_lib}/libpcprofile.so

glibc-utils.head.in

@@ -0,0 +1,7 @@
+%define flavor utils
+
+Name:           glibc-utils
+Summary:        Development utilities from the GNU C Library
+License:        LGPL-2.1+
+Group:          Development/Languages/C and C++
+Requires:       glibc = %{version}

glibc-utils.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package glibc
+# spec file for package glibc-utils
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -25,6 +25,12 @@
 
 %define flavor utils
 
+Name:           glibc-utils
+Summary:        Development utilities from the GNU C Library
+License:        LGPL-2.1+
+Group:          Development/Languages/C and C++
+Requires:       glibc = %{version}
+
 %bcond_with all
 %define build_main 1
 %define build_utils %{with all}
@@ -40,10 +46,6 @@
 %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
@@ -292,31 +294,22 @@ Patch2008:      reinitialize-dl_load_write_lock.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
-%package utils
+%if %build_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
-%package testsuite
+%if %build_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
@@ -1132,14 +1125,8 @@ exit 0
 %service_del_postun nscd.service
 exit 0
 
-%if %{build_main}
 %files
-#######################################################################
+%if %{build_main}
-###
-### FILES
-###
-#######################################################################
-
 # glibc
 %defattr(-,root,root)
 %doc LICENSES
@@ -1418,7 +1405,6 @@ exit 0
 %endif # main
 
 %if %{build_utils}
-%files utils
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
 /%{_lib}/libpcprofile.so

glibc.spec

@@ -23,7 +23,18 @@
 %define crypt_bf_version 1.3
 %define build_snapshot 0
 
-%define flavor %{nil}
+# INCLUDE glibc$flavor.head.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.head.in
 
 %bcond_with all
 %define build_main 1
@@ -40,10 +51,6 @@
 %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
@@ -292,31 +299,22 @@ Patch2008:      reinitialize-dl_load_write_lock.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
-%package utils
+%if %build_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
-%package testsuite
+%if %build_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
@@ -1132,14 +1130,8 @@ exit 0
 %service_del_postun nscd.service
 exit 0
 
-%if %{build_main}
 %files
-#######################################################################
+%if %{build_main}
-###
-### FILES
-###
-#######################################################################
-
 # glibc
 %defattr(-,root,root)
 %doc LICENSES
@@ -1418,7 +1410,6 @@ exit 0
 %endif # main
 
 %if %{build_utils}
-%files utils
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
 /%{_lib}/libpcprofile.so

pre_checkin.sh

@@ -1,4 +1,8 @@
 #!/bin/sh
-for flavor in -utils -testsuite .i686; do
+for flavor in utils testsuite; do
-  sed "/^%define flavor/s/%{nil}/${flavor#?}/" glibc.spec > glibc$flavor.spec
+  sed -e "/^# INCLUDE /r glibc-$flavor.head.in" \
+      -e "/^# INCLUDE /,/^# END INCLUDE /d" \
+      glibc.spec > glibc-$flavor.spec
+  cp glibc.changes glibc-$flavor.changes
 done
+osc service lr format_spec_file