From a715d6e38a2abe15ee070a36c9f9cad00fcd052edc7dc72bd3a216ebcbb31391 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 17 Jun 2011 13:24:08 +0000 Subject: [PATCH] Accepting request 74024 from Base:System forwarding to factory OBS-URL: https://build.opensuse.org/request/show/74024 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=51 --- glibc.changes | 6 +++++ glibc.spec | 68 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 55 insertions(+), 19 deletions(-) diff --git a/glibc.changes b/glibc.changes index 480a3c6..553c370 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 17 09:50:19 UTC 2011 - aj@suse.de + +- Cleanup ld.so.conf list, move kde directories to + kdelibs3 (bnc#671725). + ------------------------------------------------------------------- Fri Jun 17 07:07:37 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index 1a9d5bb..6d26f74 100644 --- a/glibc.spec +++ b/glibc.spec @@ -71,7 +71,7 @@ Obsoletes: glibc-64bit Obsoletes: glibc-32bit %endif Version: 2.13 -Release: 7 +Release: 5 Url: http://www.gnu.org/software/libc/libc.html Source: glibc-%{version}-996cf2ef0727.tar.bz2 Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2 @@ -207,6 +207,7 @@ Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff + %description The GNU C Library provides the most important standard libraries used by nearly all programs: the standard C library, the standard math @@ -219,6 +220,7 @@ Summary: Info Files for the GNU C Library Group: Documentation/Other PreReq: %{install_info_prereq} + %description info This package contains the documentation for the GNU C library stored as info files. Due to a lack of resources, this documentation is not @@ -229,6 +231,7 @@ License: GPLv2+ ; LGPLv2.1+ Summary: HTML Documentation for the GNU C Library Group: Documentation/HTML + %description html This package contains the HTML documentation for the GNU C library. Due to a lack of resources, this documentation is not complete and is @@ -239,6 +242,7 @@ License: LGPLv2.1+ Summary: Database Sources for 'locale' Group: System/Libraries + %description i18ndata This package contains the data needed to build the locale data files to use the internationalization features of the GNU libc. It is normally @@ -259,6 +263,7 @@ Obsoletes: glibc-locale-64bit Obsoletes: glibc-locale-32bit %endif + %description locale Locale data for the internationalisation features of the GNU C library. @@ -270,6 +275,7 @@ Provides: aaa_base:/etc/init.d/nscd Provides: glibc:/usr/sbin/nscd PreReq: %insserv_prereq + %description -n nscd Nscd caches name service lookups and can dramatically improve performance with NIS, NIS+, and LDAP. @@ -287,6 +293,7 @@ Obsoletes: glibc-profile-64bit Obsoletes: glibc-profile-32bit %endif + %description profile This package contains special versions of the GNU C library which are necessary for profiling and debugging. @@ -307,6 +314,7 @@ Obsoletes: glibc-devel-32bit PreReq: /bin/rm Requires: glibc = %{version}, linux-kernel-headers + %description devel These libraries are needed to develop programs which use the standard C library. @@ -318,6 +326,7 @@ Summary: C library static libraries for -static linking Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} + %description devel-static The glibc-devel-static package contains the C library static libraries for -static linking. You don't need these, unless you link statically, @@ -329,6 +338,7 @@ Summary: Development utilities from GNU C library Group: Development/Languages/C and C++ Requires: glibc = %{version} + %description utils The glibc-utils package contains memusage, a memory usage profiler, mtrace, a memory leak tracer and xtrace, a function call tracer @@ -338,12 +348,14 @@ If you are unsure if you need this, don't install this package. %ifarch %ix86 + %package obsolete License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ Summary: Obsolete Shared Libraries from the GNU C Library Group: System/Libraries Requires: glibc = %{version} + %description obsolete This package provides some old libraries from the GNU C Library which are no longer supported. Additional it provides a compatibility library @@ -356,6 +368,7 @@ versions of your software. %endif + %prep %ifarch %arm armv5tel armv7l # add glibc-ports for arm @@ -462,6 +475,7 @@ find . -name configure | xargs touch ### ####################################################################### + %build if [ -x /bin/uname.bin ]; then /bin/uname.bin -a @@ -637,6 +651,7 @@ $BuildCC -static $RPM_OPT_FLAGS -Os $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glib ### ####################################################################### + %check %if %{run_testsuite} # Increase timeout @@ -659,6 +674,7 @@ make -C cc-base check-abi || echo check-abi failed ### ####################################################################### + %install # 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 @@ -783,30 +799,22 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid} # Create ld.so.conf # cat > $RPM_BUILD_ROOT/etc/ld.so.conf <