Accepting request 75320 from Base:System

Various small fixes. OBS-URL: https://build.opensuse.org/request/show/75320 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=63
2011-07-05 08:02:04 +00:00
parent 639626b306
commit ad7ace6636
15 changed files with 189 additions and 175 deletions
--- a/glibc.spec
+++ b/glibc.spec
@@ -77,7 +77,7 @@ Obsoletes:      glibc-64bit
 Obsoletes:      glibc-32bit
 %endif
 Version:        2.13
-Release:        19
+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
@@ -111,7 +111,7 @@ Patch3:         glibc-resolv-reload.diff
 Patch4:         glibc-2.3.locales.diff.bz2
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch5:         crypt_blowfish-1.0-suse.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+# PATCH-FIX-OPENSUSE add some extra information to version output - kukuk@suse.de
 Patch7:         glibc-version.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch8:         glibc-2.4.90-revert-only-euro.diff
@@ -135,9 +135,9 @@ Patch21:        glibc-2.3.4-gb18030-big5hkscs.diff.bz2
 Patch22:        glibc-2.4.90-nscd.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch23:        glibc-2.3.3-nscd-db-path.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+# PATCH-FIX-UPSTREAM - handle zero negative timeout, committed for glibc 2.15
 Patch24:        glibc-2.3.5-nscd-zeronegtimeout.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+# PATCH-FIX-OPENSUSE prefer -lang rpm packages
 Patch25:        glibc-2.3.90-langpackdir.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch27:        glibc-2.6-configure.diff
@@ -153,19 +153,17 @@ Patch31:        ppc-atomic.diff
 Patch33:        glibc-compiled-binaries.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch36:        glibc-no-unwind-tables.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+# PATCH-FIX-OPENSUSE bnc#387202
 Patch37:        glibc-2.10-nscd-nostack.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de
 Patch38:        glibc-cpusetsize.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch39:        glibc-2.10.99-ia64-include.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch40:        libm-x86-64-exceptions.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch41:        glibc-uio-cell.diff
 # PATCH-FIX-SLE -- Do not assume statfs64 exists for ia64's ia32 layer bnc#534828
 Patch42:        glibc-statfs64-ia64.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+# PATCH-FIX-UPSTREAM -- add missing includes aj@suse.de
 Patch43:        missing-include-build-fix.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch44:        glibc-ppc64-vdso-time.diff
@@ -181,7 +179,7 @@ Patch48:        glibc-malloc-arena-max.diff
 Patch49:        glibc-fini-unwind.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch50:        glibc-gconvcache-s390.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+# PATCH-FIX-UPSTREAM - Fix alloca argument bso#12445 aj@suse.de
 Patch51:        glibc-vfprintf-positional.diff
 # PATCH-FIX-OPENSUSE bnc#657627
 Patch52:        glibc-elf-localscope.diff
@@ -203,14 +201,10 @@ Patch60:        glibc-x86-bits-sigcontext.patch
 Patch61:        glibc-2.15-getsysstats-speedup.patch
 # PATCH-FIX-UPSTREAM Fix gcc 4.6 warnings aj@suse.de
 Patch62:        glibc-2.13-warnings.fix
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch500:       ARM_glibc-2.10.1-local-eabi-wchar.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch501:       ARM_glibc-2.10.1-local-hwcap-updates.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-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
+# PATCH-FIX-OPENSUSE Fix localedef locale-archive creation bso#10855 aj@suse.de
+Patch63:        glibc-2.13-localedef.patch
+# PATCH-FIX-UPSTREAM Fix futex bug bso#12403 aj@suse.de
+Patch64:        glibc-fix-rwlock-stack-imbalance.patch

 %description
 The GNU C Library provides the most important standard libraries used
@@ -225,6 +219,7 @@ Group:          Documentation/Other
 Requires(post): %{install_info_prereq}
 Requires(postun): %{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
@@ -235,6 +230,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
@@ -245,6 +241,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
@@ -265,6 +262,7 @@ Obsoletes:      glibc-locale-64bit
 Obsoletes:      glibc-locale-32bit
 %endif

+
 %description locale
 Locale data for the internationalisation features of the GNU C library.

@@ -278,6 +276,7 @@ Requires(preun): %insserv_prereq
 Requires(post): %insserv_prereq
 Requires(postun): %insserv_prereq

+
 %description -n nscd
 Nscd caches name service lookups and can dramatically improve
 performance with NIS, NIS+, and LDAP.
@@ -295,6 +294,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.
@@ -315,17 +315,18 @@ Obsoletes:      glibc-devel-32bit
 Requires:       glibc = %{version}
 Requires:       linux-kernel-headers

+
 %description devel
 These libraries are needed to develop programs which use the standard C
 library.

 %package devel-static

-
 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,
@@ -337,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 mtrace, a memory leak tracer and
 xtrace, a function call tracer which can be helpful during program
@@ -346,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
@@ -364,11 +368,12 @@ versions of your software.

 %endif

+
 %prep
 %ifarch %arm armv5tel armv7l
 # add glibc-ports for arm
-# this is CURRENTLY BROKEN; ARM-interested contributors need to provide
-# new tested glibc-ports source
+# this is CURRENTLY BROKEN (as of 2009-11-13); ARM-interested
+# contributors need to provide new tested glibc-ports source
 %setup -n glibc-%{version} -q -a 2 -a 3 -a 4
 %else
 # any other leave out ports
@@ -377,13 +382,15 @@ versions of your software.
 %patch0
 # libNoVersion part is only active on ix86
 %patch1
-%patch2 -p1
+# Disabled
+# %patch2 -p1
 %patch3
 %patch4
 %patch5
 %patch7
 %patch8
-%patch11
+# Disabled
+#%patch11
 %patch12
 %patch13 -E
 # We have s_sincos.c in patch13, remove duplicate
@@ -409,9 +416,9 @@ rm nscd/s-stamp
 %patch31
 %patch33
 %patch36
-%patch37
+# Disable for now
+#%patch37
 %patch38
-%patch39
 %patch40
 %patch41 -p1
 %if 0%{?sles_version}
@@ -439,12 +446,10 @@ rm nscd/s-stamp
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
-%ifarch %arm armv5tel armv7l
-%patch500
-%patch501
-%patch502
-%patch503
-%endif
+%patch63 -p1
+%patch64 -p1
+
+
 #
 # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
 #
@@ -471,6 +476,7 @@ find . -name configure | xargs touch
 ###
 #######################################################################

+
 %build
 if [ -x /bin/uname.bin ]; then
 	/bin/uname.bin -a
@@ -646,6 +652,7 @@ $BuildCC -static %{optflags} -Os $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_p
 ###
 #######################################################################

+
 %check
 %if %{run_testsuite}
 	# Increase timeout
@@ -668,6 +675,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
@@ -792,23 +800,14 @@ touch %{buildroot}/var/run/nscd/{socket,nscd.pid}
 # Create ld.so.conf
 #
 cat > %{buildroot}/etc/ld.so.conf <<EOF
-/usr/%{_lib}/Xaw3d
 %ifarch s390x sparc64 x86_64 ppc64 ppc
-/usr/lib/Xaw3d
+/usr/local/lib64
 %endif
-/usr/local/%{_lib}
-%ifarch s390x sparc64 x86_64 ppc64 ppc
 /usr/local/lib
-%endif
-/%{_lib}
-%ifarch s390x sparc64 x86_64 ppc64 ppc
-/lib
-%endif
-/usr/%{_lib}
-%ifarch s390x sparc64 x86_64 ppc64 ppc
-/usr/lib
-%endif
 include /etc/ld.so.conf.d/*.conf
+# /lib64, /lib, /usr/lib64 and /usr/lib gets added
+# automatically by ldconfig after parsing this file.
+# So, they do not need to be listed.
 EOF
 # Add ldconfig cache directory for directory ownership
 mkdir -p %{buildroot}/var/cache/ldconfig
@@ -843,6 +842,7 @@ done
 ###
 #######################################################################

+
 %clean
 rm -rf %{buildroot}

@@ -850,10 +850,13 @@ rm -rf %{buildroot}
 # %%set_permissions %%{_libdir}/pt_chown
 # since we cannot do it in our own post section

+
 %post -p %{_sbindir}/glibc_post_upgrade

+
 %postun -p /sbin/ldconfig

+
 %post locale
 for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
 	[ -d "$l.d" ] || continue
@@ -862,19 +865,24 @@ for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
 done
 /usr/sbin/iconvconfig

+
 %post info
 %install_info --info-dir=%{_infodir} %{_infodir}/libc.info.gz

+
 %postun info
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz

+
 %preun -n nscd
 %stop_on_removal nscd

+
 %post -n nscd
 %{insserv_force_if_yast nscd}
 mkdir -p /var/run/nscd

+
 %postun -n nscd
 %restart_on_update nscd
 %insserv_cleanup
@@ -891,6 +899,7 @@ exit 0

 # glibc

+
 %files
 %defattr(-,root,root)
 %doc LICENSES
@@ -1018,6 +1027,7 @@ exit 0

 %ifarch %ix86

+
 %files obsolete
 %defattr (755,root,root,755)
 %dir /%{_lib}/obsolete/
@@ -1026,6 +1036,7 @@ exit 0
 	/%{_lib}/obsolete/noversion/libNoVersion.so.1
 %endif

+
 %files locale -f libc.lang
 %defattr(-,root,root)
 %{_datadir}/locale/locale.alias
@@ -1034,6 +1045,7 @@ exit 0
 %endif
 %{_libdir}/gconv

+
 %files devel
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB FAQ INSTALL NEWS NOTES README BUGS CONFORMANCE
@@ -1060,6 +1072,7 @@ exit 0
 %{_libdir}/libpthread_nonshared.a
 %{_libdir}/librpcsvc.a

+
 %files devel-static
 %defattr(-,root,root)
 %{_libdir}/libBrokenLocale.a
@@ -1074,20 +1087,24 @@ exit 0
 %{_libdir}/librt.a
 %{_libdir}/libutil.a

+
 %files info
 %defattr(-,root,root)
 %doc %{_infodir}/libc.info.gz
 %doc %{_infodir}/libc.info-?.gz
 %doc %{_infodir}/libc.info-??.gz

+
 %files html
 %defattr(-,root,root)
 %doc %{_prefix}/share/doc/glibc

+
 %files i18ndata
 %defattr(-,root,root)
 %{_prefix}/share/i18n

+
 %files -n nscd
 %defattr(-,root,root)
 %config(noreplace) /etc/nscd.conf
@@ -1103,6 +1120,7 @@ exit 0
 %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/group
 %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/hosts

+
 %files profile
 %defattr(-,root,root)
 %{_libdir}/libc_p.a
@@ -1118,6 +1136,7 @@ exit 0
 %{_libdir}/libutil_p.a
 %{_libdir}/libdl_p.a

+
 %files utils
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
@@ -1129,4 +1148,6 @@ exit 0
 %{_bindir}/pcprofiledump
 %{_bindir}/xtrace

+
+
 %changelog