Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2012-12-30 12:19:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibc", Maintainer is "schwab@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc-testsuite.changes 2012-12-19 14:47:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-testsuite.changes 2012-12-30 12:19:20.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Dec 25 16:50:52 UTC 2012 - aj@suse.de + +- Update to glibc 2.17 release (git id c758a6861537): + * bump version number + * update translations + +------------------------------------------------------------------- +Tue Dec 18 10:28:01 UTC 2012 - schwab@suse.de + +- Move glibc-utils subpackage to own specfile and enable programs that + require libgd +- Filter GLIBC_PRIVATE symbols +- Don't stop at first error in testsuite run + +------------------------------------------------------------------- New Changes file: --- /dev/null 2012-12-21 01:49:00.356010756 +0100 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc-utils.changes 2012-12-30 12:19:20.000000000 +0100 @@ -0,0 +1,6582 @@ +------------------------------------------------------------------- +Tue Dec 25 16:50:52 UTC 2012 - aj@suse.de + +- Update to glibc 2.17 release (git id c758a6861537): + * bump version number + * update translations + +------------------------------------------------------------------- +Tue Dec 18 10:28:01 UTC 2012 - schwab@suse.de + +- Move glibc-utils subpackage to own specfile and enable programs that + require libgd +- Filter GLIBC_PRIVATE symbols +- Don't stop at first error in testsuite run + +------------------------------------------------------------------- +Mon Dec 17 11:16:49 UTC 2012 - schwab@suse.de + +- Split off glibc-testsuite package + +------------------------------------------------------------------- +Fri Dec 14 19:31:45 UTC 2012 - aj@suse.de + +- Build profile and locale packages for i686 as well. + +------------------------------------------------------------------- +Wed Dec 12 08:32:53 UTC 2012 - aj@suse.de + +- Update to 4641d57e1e00: + * Updated translations + * bug fixes + +------------------------------------------------------------------- +Mon Dec 10 13:08:01 UTC 2012 - schwab@suse.de + +- pthread-cond-timedwait-i486.patch: + Extend i486 pthread_cond_timedwait to use futex syscall with absolute + timeout +- nscd-short-write.patch: + Properly check for short writes when sending the response in nscd + +------------------------------------------------------------------- +Sat Dec 8 18:55:53 UTC 2012 - aj@suse.de + +- Update to 56e7d3ad5c2f: + * Bugfixes + * Fix warnings building glibc +- Remove upstreamed patch glibc-revert-fseek-on-fclose.diff + +------------------------------------------------------------------- +Mon Dec 3 15:45:08 UTC 2012 - aj@suse.de + +- Remove nosegneg i686 library, it's only used for a 32-bit Xen + hypervisor (not for a 32-bit guest running under 64-bit hypervisor), + and since the 32-bit Xen hypervisor is not part of openSUSE anymore, + it is unneeded (bnc#789607). + +------------------------------------------------------------------- +Mon Dec 3 14:47:22 UTC 2012 - schwab@suse.de + +- Suppress error message from systemctl in %post -n nscd (bnc#792333) + +------------------------------------------------------------------- +Sat Dec 1 08:55:05 UTC 2012 - aj@suse.de + +- Update to f638872ab422: + Fix regression introduced with last update in sunrpc code + Fix assertion failure in resolver + Bug fixes +- Remove upstreamed patch glibc-resolv-assert.diff + +------------------------------------------------------------------- +Fri Nov 30 09:15:15 UTC 2012 - aj@suse.de + +- Update to c93ec1f091ec: + Warn about unsupported DT_FLAGS_1 flags + Add Interlingua locale + Bug fixes + +------------------------------------------------------------------- +Thu Nov 29 14:30:11 UTC 2012 - schwab@suse.de + +- Remove obsolete patches: + glibc-strict-aliasing.diff + nscd-avoid-gcc-warning.diff + +------------------------------------------------------------------- +Wed Nov 28 15:48:32 UTC 2012 - aj@suse.de + +- Update to e3c6aa3a5848: + * Fix powerpc64 make abi check failure + * bugfixes +- Install nscd.socket to new /usr location + +------------------------------------------------------------------- +Wed Nov 28 09:31:11 UTC 2012 - schwab@suse.de + +- Reenable multi-arch on ppc ppc64 + +------------------------------------------------------------------- +Tue Nov 27 21:34:15 UTC 2012 - aj@suse.de + +- Update to de2fd463b1c0: + Various bugfixes including: + * Fix fwrite bug causing grep etc testsuite failure + * sotruss: fix argument parsing + * Check supported DF_1_XXX bits + Add new locales niu_NU and niu_NZ +- Refresh patch glibc-revert-fseek-on-fclose.diff + +------------------------------------------------------------------- +Sat Nov 24 13:48:40 UTC 2012 - aj@suse.de + +- Remove nscd init script, use systemd files. + +------------------------------------------------------------------- +Fri Nov 23 14:33:37 UTC 2012 - matz@suse.com + +- Fix getaddrinfo-ipv6-sanity.diff to apply again. + +------------------------------------------------------------------- +Tue Nov 20 08:06:49 UTC 2012 - aj@suse.de + +- Update to f59cba71d848: + * Various bug fixes + * Add new locales szl_PL, ayc_PE, nhn_MX, doi_IN, mni_IN, sat_IN. + * Remove patch glibc-compiled-binaries.diff since getconf can not be + cross-compiled + * Refresh patch glibc-2.3.90-bindresvport.blacklist.diff + +------------------------------------------------------------------- +Sun Nov 11 09:54:43 UTC 2012 - aj@suse.de + +- Update to current glibc 2.17 development snapshot (git 7e2bd01fcf3c): + * Upstream changes: + + ports is now part of main tarball + + Add port to ARM AArch64 + + New function secure_getenv + + Systemtap static probes + + The `clock_*' suite of functions (declared in <time.h>) is now + available directly in the main C library. + + The `crypt' function now fails if passed salt bytes that violate the + specification for those values. On Linux, the `crypt' function will + consult /proc/sys/crypto/fips_enabled to determine if "FIPS mode" is + enabled, and fail on encrypted strings using the MD5 or DES algorithm + when the mode is enabled. + + Optimzations and bug fixes + * remove upstream patches malloc-check-size.patch, + glibc-2.16-getaddrinfo-buffer.patch, sparc-bind-now.patch, + pthread-cond-wait-revert.patch + * Remove now obsolete patch glibc-gai-private4.diff + * Refresh patches glibc-2.14-crypt.diff, glibc-2.14-crypt-versioning.diff, + glibc-fix-check-abi.patch, nss-db-path.patch, glibc-2.3.90-noversion.diff, + glibc-revert-fseek-on-fclose.diff + * Disable patches glibc-compiled-binaries.diff, getaddrinfo-ipv6-sanity.diff + and glibc-gai-private4.diff. + * Use git id instead of ChangeLog date in version output (patch glibc-version.diff) + * Enable multi-arch on all architectures that support it. + +------------------------------------------------------------------- +Wed Nov 7 14:59:06 UTC 2012 - schwab@suse.de + +- Avoid shell comment leaking into %post. + +------------------------------------------------------------------- +Thu Oct 25 07:30:04 UTC 2012 - aj@suse.de + +- Update to glibc 2.16 c3b96f90c9c1: + - Fix missing _mcount@GLIBC_2.0 on powerpc32 (replaces + patch glibc-2.16-ppc32-mcount.patch) +- Drop patch glibc-elf-localscope.diff, fixed upstream in 2.16 + in a different way. + +------------------------------------------------------------------- +Tue Oct 9 07:15:12 UTC 2012 - aj@suse.de + +- Fix malloc_usable_size (swo#1349, bnc#745247) (patch + malloc-check-size.patch). + +- Update to current glibc 2.16 (git a5cfcf08ffaa): + * fix fma detection + * Don't parse %s format argument as multibyte string + * Use size_t instead of int for internal variables in glob + * Properly handle fencepost with MALLOC_ALIGN_MASK + +------------------------------------------------------------------- +Sat Oct 6 08:51:46 UTC 2012 - meissner@suse.com + +- make glibc-devel-<baselib> require glibc-<baselib> just + like glibc-devel + +------------------------------------------------------------------- +Fri Sep 28 07:47:33 UTC 2012 - aj@suse.de + +- Fix crash in relocation on sparc with bind-now (swo#14376) + (patch sparc-bind-now.patch). + ++++ 6385 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.glibc.new/glibc-utils.changes --- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2012-12-19 14:47:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc.changes 2012-12-30 12:19:20.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Dec 25 16:50:52 UTC 2012 - aj@suse.de + +- Update to glibc 2.17 release (git id c758a6861537): + * bump version number + * update translations + +------------------------------------------------------------------- +Tue Dec 18 10:28:01 UTC 2012 - schwab@suse.de + +- Move glibc-utils subpackage to own specfile and enable programs that + require libgd +- Filter GLIBC_PRIVATE symbols +- Don't stop at first error in testsuite run + +------------------------------------------------------------------- Old: ---- glibc-2.16.90-4641d57e1e00.tar.xz New: ---- glibc-2.17-c758a6861537.tar.xz glibc-utils.changes glibc-utils.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.iZNFcx/_old 2012-12-30 12:19:24.000000000 +0100 +++ /var/tmp/diff_new_pack.iZNFcx/_new 2012-12-30 12:19:24.000000000 +0100 @@ -18,7 +18,7 @@ # PLEASE run pre_checkin.sh in this directory before submitting # this package. Otherwise the .spec and .changes for glibc-testsuite -# aren't updated. +# and glibc-utils aren't updated. # Run with osc --with=fast_build to have a shorter turnaround # It will avoid building some parts of glibc @@ -27,10 +27,14 @@ %define crypt_bf_version 1.2 Name: glibc-testsuite +%define normal_build ("%{name}" == "glibc") +%define utils_build ("%{name}" == "glibc-utils") %define testsuite_build ("%{name}" == "glibc-testsuite") +# UTILS-SUMMARY-BEGIN 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 +# UTILS-SUMMARY-END BuildRequires: fdupes BuildRequires: libselinux-devel BuildRequires: makeinfo @@ -40,8 +44,11 @@ BuildRequires: gcc-c++ BuildRequires: libstdc++-devel %endif +%if %{utils_build} +BuildRequires: gd-devel +%endif -%define _filter_GLIBC_PRIVATE 1 +%define __filter_GLIBC_PRIVATE 1 %if %_target_cpu == "i686" # For i686 let's only build what's different from i586, so # no need to build documentation @@ -49,7 +56,7 @@ %define build_locales 1 %define build_html 0 %else -%if %{with fast_build} +%if %{with fast_build} || %{utils_build} %define build_profile 0 %define build_locales 0 %define build_html 0 @@ -68,7 +75,7 @@ %ifarch ppc %define powerpc_optimize_base power3 %define powerpc_optimize_tune power3 - %define powerpc_optimize_cpu_power4 1 + %define powerpc_optimize_cpu_power4 %{normal_build} %else %define powerpc_optimize_base power4 %define powerpc_optimize_tune power5 @@ -94,28 +101,10 @@ # 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel %define enablekernel 2.6.16 %endif -# ngpt was used in 8.1 and SLES8 -Obsoletes: ngpt < 2.2.2 -Obsoletes: ngpt-devel < 2.2.2 -Provides: ngpt = 2.2.2 -Provides: ngpt-devel = 2.2.2 -Conflicts: kernel < %{enablekernel} -# bug437293 - handle update from SLES10 on PowerPC -%ifarch ppc64 -Obsoletes: glibc-64bit -%endif -%ifarch ppc -Obsoletes: glibc-32bit -%endif -%ifarch armv7l armv7hl -# The old runtime linker link gets not provided by rpm find.provides, but it exists -Provides: ld-linux.so.3 -Provides: ld-linux.so.3(GLIBC_2.4) -%endif -Version: 2.16.90 +Version: 2.17 Release: 0 -%define glibc_major_version 2.16.90 -%define git_id 4641d57e1e00 +%define glibc_major_version 2.17 +%define git_id c758a6861537 Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: glibc-%{version}-%{git_id}.tar.xz @@ -133,9 +122,32 @@ Source50: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign +%if %{normal_build} +# ngpt was used in 8.1 and SLES8 +Obsoletes: ngpt < 2.2.2 +Obsoletes: ngpt-devel < 2.2.2 +Provides: ngpt = 2.2.2 +Provides: ngpt-devel = 2.2.2 +Conflicts: kernel < %{enablekernel} +# bug437293 - handle update from SLES10 on PowerPC +%ifarch ppc64 +Obsoletes: glibc-64bit +%endif +%ifarch ppc +Obsoletes: glibc-32bit +%endif +%ifarch armv7l armv7hl +# The old runtime linker link gets not provided by rpm find.provides, but it exists +Provides: ld-linux.so.3 +Provides: ld-linux.so.3(GLIBC_2.4) +%endif Requires(pre): filesystem Recommends: glibc-extra Provides: rtld(GNU_HASH) +%endif # %{normal_build} +%if %{utils_build} +Requires: glibc = %{version} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %_target_cpu == "i686" # We need to avoid to have only the src rpm from i686 on the media, @@ -358,19 +370,6 @@ for -static linking. You don't need these, unless you link statically, which is highly discouraged. -%package utils -Summary: Development utilities from 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, don't install this package. - # makedb requires libselinux. We add this program in a separate # package so that glibc does not require libselinux. %package extra @@ -699,7 +698,7 @@ # s390,s390x: tst-timer* fails make %{?_smp_mflags} -C cc-base -k check || echo make check failed %else - make %{?_smp_mflags} -C cc-base check + make %{?_smp_mflags} -C cc-base -k check %endif %endif # This has to pass on all platforms! @@ -714,7 +713,7 @@ ####################################################################### %install -%if !%{testsuite_build} +%if %{normal_build} # We don't want to strip the .symtab from our libraries in find-debuginfo.sh, # certainly not from libpthread.so.* because it is used by libthread_db to find # some non-exported symbols in order to detect if threading support @@ -913,7 +912,35 @@ # Move getconf to %{_libexecdir}/getconf/ to avoid cross device link mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf -%endif # !%{testsuite_build} + +# Remove unwanted files (packaged in glibc-utils) +rm -f %{buildroot}/%{_lib}/libmemusage* +rm -f %{buildroot}/%{_lib}/libpcprofile* +rm -f %{buildroot}%{_bindir}/memusage* +rm -f %{buildroot}%{_bindir}/mtrace +rm -f %{buildroot}%{_bindir}/pcprofiledump +rm -f %{buildroot}%{_bindir}/sotruss +rm -f %{buildroot}%{_bindir}/xtrace +rm -f %{buildroot}%{_bindir}/pldd +rm -f %{buildroot}%{_mandir}/man1/mtrace.* +rm -rf %{buildroot}%{_libdir}/audit + +%endif # %{normal_build} + +%if %{utils_build} + +make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base \ + subdirs='malloc debug elf' +cd manpages; make install_root=%{buildroot} install; cd .. +# Remove unwanted files +rm -f %{buildroot}/%{_lib}/ld*.so* %{buildroot}/%{_lib}/lib[!mp]* +rm -f %{buildroot}%{_libdir}/lib* +rm -f %{buildroot}%{_bindir}/{catchsegv,ldd*,sprof} +rm -f %{buildroot}%{_mandir}/man1/[!m]* +rm -rf %{buildroot}%{_mandir}/man[!1] +rm -rf %{buildroot}/sbin %{buildroot}%{_includedir} + +%endif # %{utils_build} ####################################################################### ### @@ -921,6 +948,7 @@ ### ####################################################################### +%if %{normal_build} # Note: glibc_post_upgrade does: # %%set_permissions %%{_libexecdir}/pt_chown # since we cannot do it in our own post section @@ -940,6 +968,8 @@ %postun -p /sbin/ldconfig +%endif # %{normal_build} + %post locale for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do [ -d "$l.d" ] || continue @@ -974,7 +1004,7 @@ %service_del_postun nscd.service exit 0 -%if !%{testsuite_build} +%if %{normal_build} %files ####################################################################### ### @@ -1223,27 +1253,28 @@ %{_libdir}/libdl_p.a %endif -%files utils +%files extra +%defattr(-,root,root) +%{_bindir}/makedb +/var/lib/misc/Makefile + +%endif # %{normal_build} + +%if %{utils_build} +%files %defattr(-,root,root) /%{_lib}/libmemusage.so /%{_lib}/libpcprofile.so -%dir /%{_libdir}/audit -/%{_libdir}/audit/sotruss-lib.so -# These need gd-devel for building -# %%{_bindir}/memusage -# %%{_bindir}/memusagestat +%dir %{_libdir}/audit +%{_libdir}/audit/sotruss-lib.so +%{_bindir}/memusage +%{_bindir}/memusagestat %{_bindir}/mtrace %{_bindir}/pcprofiledump %{_bindir}/sotruss %{_bindir}/xtrace %{_bindir}/pldd %doc %{_mandir}/man1/mtrace.1.gz - -%files extra -%defattr(-,root,root) -%{_bindir}/makedb -/var/lib/misc/Makefile - -%endif # !%{testsuite_build} +%endif # %{utils_build} %changelog ++++++ glibc-utils.spec ++++++ ++++ 1280 lines (skipped) ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.iZNFcx/_old 2012-12-30 12:19:24.000000000 +0100 +++ /var/tmp/diff_new_pack.iZNFcx/_new 2012-12-30 12:19:24.000000000 +0100 @@ -18,7 +18,7 @@ # PLEASE run pre_checkin.sh in this directory before submitting # this package. Otherwise the .spec and .changes for glibc-testsuite -# aren't updated. +# and glibc-utils aren't updated. # Run with osc --with=fast_build to have a shorter turnaround # It will avoid building some parts of glibc @@ -27,10 +27,14 @@ %define crypt_bf_version 1.2 Name: glibc +%define normal_build ("%{name}" == "glibc") +%define utils_build ("%{name}" == "glibc-utils") %define testsuite_build ("%{name}" == "glibc-testsuite") +# UTILS-SUMMARY-BEGIN 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 +# UTILS-SUMMARY-END BuildRequires: fdupes BuildRequires: libselinux-devel BuildRequires: makeinfo @@ -40,8 +44,11 @@ BuildRequires: gcc-c++ BuildRequires: libstdc++-devel %endif +%if %{utils_build} +BuildRequires: gd-devel +%endif -%define _filter_GLIBC_PRIVATE 1 +%define __filter_GLIBC_PRIVATE 1 %if %_target_cpu == "i686" # For i686 let's only build what's different from i586, so # no need to build documentation @@ -49,7 +56,7 @@ %define build_locales 1 %define build_html 0 %else -%if %{with fast_build} +%if %{with fast_build} || %{utils_build} %define build_profile 0 %define build_locales 0 %define build_html 0 @@ -68,7 +75,7 @@ %ifarch ppc %define powerpc_optimize_base power3 %define powerpc_optimize_tune power3 - %define powerpc_optimize_cpu_power4 1 + %define powerpc_optimize_cpu_power4 %{normal_build} %else %define powerpc_optimize_base power4 %define powerpc_optimize_tune power5 @@ -94,28 +101,10 @@ # 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel %define enablekernel 2.6.16 %endif -# ngpt was used in 8.1 and SLES8 -Obsoletes: ngpt < 2.2.2 -Obsoletes: ngpt-devel < 2.2.2 -Provides: ngpt = 2.2.2 -Provides: ngpt-devel = 2.2.2 -Conflicts: kernel < %{enablekernel} -# bug437293 - handle update from SLES10 on PowerPC -%ifarch ppc64 -Obsoletes: glibc-64bit -%endif -%ifarch ppc -Obsoletes: glibc-32bit -%endif -%ifarch armv7l armv7hl -# The old runtime linker link gets not provided by rpm find.provides, but it exists -Provides: ld-linux.so.3 -Provides: ld-linux.so.3(GLIBC_2.4) -%endif -Version: 2.16.90 +Version: 2.17 Release: 0 -%define glibc_major_version 2.16.90 -%define git_id 4641d57e1e00 +%define glibc_major_version 2.17 +%define git_id c758a6861537 Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: glibc-%{version}-%{git_id}.tar.xz @@ -133,9 +122,32 @@ Source50: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign +%if %{normal_build} +# ngpt was used in 8.1 and SLES8 +Obsoletes: ngpt < 2.2.2 +Obsoletes: ngpt-devel < 2.2.2 +Provides: ngpt = 2.2.2 +Provides: ngpt-devel = 2.2.2 +Conflicts: kernel < %{enablekernel} +# bug437293 - handle update from SLES10 on PowerPC +%ifarch ppc64 +Obsoletes: glibc-64bit +%endif +%ifarch ppc +Obsoletes: glibc-32bit +%endif +%ifarch armv7l armv7hl +# The old runtime linker link gets not provided by rpm find.provides, but it exists +Provides: ld-linux.so.3 +Provides: ld-linux.so.3(GLIBC_2.4) +%endif Requires(pre): filesystem Recommends: glibc-extra Provides: rtld(GNU_HASH) +%endif # %{normal_build} +%if %{utils_build} +Requires: glibc = %{version} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %_target_cpu == "i686" # We need to avoid to have only the src rpm from i686 on the media, @@ -358,19 +370,6 @@ for -static linking. You don't need these, unless you link statically, which is highly discouraged. -%package utils -Summary: Development utilities from 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, don't install this package. - # makedb requires libselinux. We add this program in a separate # package so that glibc does not require libselinux. %package extra @@ -699,7 +698,7 @@ # s390,s390x: tst-timer* fails make %{?_smp_mflags} -C cc-base -k check || echo make check failed %else - make %{?_smp_mflags} -C cc-base check + make %{?_smp_mflags} -C cc-base -k check %endif %endif # This has to pass on all platforms! @@ -714,7 +713,7 @@ ####################################################################### %install -%if !%{testsuite_build} +%if %{normal_build} # We don't want to strip the .symtab from our libraries in find-debuginfo.sh, # certainly not from libpthread.so.* because it is used by libthread_db to find # some non-exported symbols in order to detect if threading support @@ -913,7 +912,35 @@ # Move getconf to %{_libexecdir}/getconf/ to avoid cross device link mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf -%endif # !%{testsuite_build} + +# Remove unwanted files (packaged in glibc-utils) +rm -f %{buildroot}/%{_lib}/libmemusage* +rm -f %{buildroot}/%{_lib}/libpcprofile* +rm -f %{buildroot}%{_bindir}/memusage* +rm -f %{buildroot}%{_bindir}/mtrace +rm -f %{buildroot}%{_bindir}/pcprofiledump +rm -f %{buildroot}%{_bindir}/sotruss +rm -f %{buildroot}%{_bindir}/xtrace +rm -f %{buildroot}%{_bindir}/pldd +rm -f %{buildroot}%{_mandir}/man1/mtrace.* +rm -rf %{buildroot}%{_libdir}/audit + +%endif # %{normal_build} + +%if %{utils_build} + +make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base \ + subdirs='malloc debug elf' +cd manpages; make install_root=%{buildroot} install; cd .. +# Remove unwanted files +rm -f %{buildroot}/%{_lib}/ld*.so* %{buildroot}/%{_lib}/lib[!mp]* +rm -f %{buildroot}%{_libdir}/lib* +rm -f %{buildroot}%{_bindir}/{catchsegv,ldd*,sprof} +rm -f %{buildroot}%{_mandir}/man1/[!m]* +rm -rf %{buildroot}%{_mandir}/man[!1] +rm -rf %{buildroot}/sbin %{buildroot}%{_includedir} + +%endif # %{utils_build} ####################################################################### ### @@ -921,6 +948,7 @@ ### ####################################################################### +%if %{normal_build} # Note: glibc_post_upgrade does: # %%set_permissions %%{_libexecdir}/pt_chown # since we cannot do it in our own post section @@ -940,6 +968,8 @@ %postun -p /sbin/ldconfig +%endif # %{normal_build} + %post locale for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do [ -d "$l.d" ] || continue @@ -974,7 +1004,7 @@ %service_del_postun nscd.service exit 0 -%if !%{testsuite_build} +%if %{normal_build} %files ####################################################################### ### @@ -1223,27 +1253,28 @@ %{_libdir}/libdl_p.a %endif -%files utils +%files extra +%defattr(-,root,root) +%{_bindir}/makedb +/var/lib/misc/Makefile + +%endif # %{normal_build} + +%if %{utils_build} +%files %defattr(-,root,root) /%{_lib}/libmemusage.so /%{_lib}/libpcprofile.so -%dir /%{_libdir}/audit -/%{_libdir}/audit/sotruss-lib.so -# These need gd-devel for building -# %%{_bindir}/memusage -# %%{_bindir}/memusagestat +%dir %{_libdir}/audit +%{_libdir}/audit/sotruss-lib.so +%{_bindir}/memusage +%{_bindir}/memusagestat %{_bindir}/mtrace %{_bindir}/pcprofiledump %{_bindir}/sotruss %{_bindir}/xtrace %{_bindir}/pldd %doc %{_mandir}/man1/mtrace.1.gz - -%files extra -%defattr(-,root,root) -%{_bindir}/makedb -/var/lib/misc/Makefile - -%endif # !%{testsuite_build} +%endif # %{utils_build} %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.iZNFcx/_old 2012-12-30 12:19:24.000000000 +0100 +++ /var/tmp/diff_new_pack.iZNFcx/_new 2012-12-30 12:19:24.000000000 +0100 @@ -20,4 +20,3 @@ glibc-profile arch i586 block! glibc-utils - arch i586 block! ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.iZNFcx/_old 2012-12-30 12:19:24.000000000 +0100 +++ /var/tmp/diff_new_pack.iZNFcx/_new 2012-12-30 12:19:24.000000000 +0100 @@ -2,6 +2,28 @@ # This script is called automatically during autobuild checkin. sed -e 's/^Name:.*glibc/&-testsuite/' glibc.spec > glibc-testsuite.spec cp glibc.changes glibc-testsuite.changes +awk '/^Name:/{ $0 = $0 "-utils" } +/UTILS-SUMMARY-BEGIN/ { + ignore = 1 + print "\ +Summary: Development utilities from GNU C library\n\ +License: LGPL-2.1+\n\ +Group: Development/Languages/C and C++" +} +/UTILS-SUMMARY-END/ { ignore = 0 } +/^%description$/ { + ignore = 1 + print "\ +%description\n\ +The glibc-utils package contains mtrace, a memory leak tracer and\n\ +xtrace, a function call tracer which can be helpful during program\n\ +debugging.\n\ +\n\ +If you are unsure if you need this, don'\''t install this package.\n" +} +/^%package/ { ignore = 0} +!ignore { print }' glibc.spec > glibc-utils.spec +cp glibc.changes glibc-utils.changes osc service localrun format_spec_file -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org