Accepting request 73727 from home:a_jaeger:branches:openSUSE:Factory

Further fixes. OBS-URL: https://build.opensuse.org/request/show/73727 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=59
2011-06-15 12:55:16 +00:00
parent 1010119ebc
commit 7cc4d3d8d9
8 changed files with 222 additions and 192 deletions
--- a/glibc.spec
+++ b/glibc.spec
@@ -15,13 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# norootforbuild


 Name:           glibc
-BuildRequires:  gcc-c++ libstdc++-devel
+BuildRequires:  gcc-c++
+BuildRequires:  gd-devel
+BuildRequires:  libpng-devel
 BuildRequires:  libselinux-devel
-BuildRequires:  gd-devel libpng-devel zlib-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  zlib-devel
 %define _filter_GLIBC_PRIVATE 1
 %define build_locales 1
 %define run_testsuite 0
@@ -43,6 +45,9 @@ BuildRequires:  gd-devel libpng-devel zlib-devel
 %define powerpc_optimize_cpu_power7 0
 %define powerpc_optimize_cpu_cell 0
 %else
+License:        GPLv2+
+Summary:        Standard Shared Libraries (from the GNU C Library)
+Group:          System/Libraries
 %define optimize_power 0
 %define powerpc_optimize_base 0
 %define powerpc_optimize_cpu_power4 0
@@ -50,18 +55,17 @@ BuildRequires:  gd-devel libpng-devel zlib-devel
 %define powerpc_optimize_cpu_power7 0
 %define powerpc_optimize_cpu_cell 0
 %endif # ppc, ppc64
-License:        GPLv2+
-Summary:        Standard Shared Libraries (from the GNU C Library)
-Group:          System/Libraries
 %ifarch %ix86 x86_64
 %define enablekernel 2.6.32
 %else
 %define enablekernel 2.6.5
 %endif
-Conflicts:      kernel < %{enablekernel}
 %define exp_malloc 1
-Obsoletes:      ngpt < 2.2.2 ngpt-devel < 2.2.2
-Provides:       ngpt = 2.2.2 ngpt-devel = 2.2.2
+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
 %ifarch ppc64
 Obsoletes:      glibc-64bit
@@ -69,13 +73,9 @@ Obsoletes:      glibc-64bit
 %ifarch ppc
 Obsoletes:      glibc-32bit
 %endif
-Provides:       rtld(GNU_HASH)
-AutoReqProv:    on
 Version:        2.13
 Release:        1
 Url:            http://www.gnu.org/software/libc/libc.html
-PreReq:         filesystem
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         glibc-%{version}-996cf2ef0727.tar.bz2
 Source2:        http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2
 Source3:        noversion.tar.bz2
@@ -87,68 +87,125 @@ Source10:       bindresvport.blacklist
 Source12:       glibc_post_upgrade.c
 Source15:       glibc.rpmlintrc
 Source16:       baselibs.conf
+PreReq:         filesystem
+PreReq:         permissions
+Provides:       rtld(GNU_HASH)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %_target_cpu == "i686"
 # We need to avoid to have only the src rpm from i686 on the media,
 # since it does not work on other architectures.
 NoSource:       0
 %endif
 #
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch0:         glibc-2.3-SuSE.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1:         glibc-2.3.90-noversion.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch2:         glibc-fnmatch-multibyte.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch3:         glibc-resolv-reload.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 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
 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
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch9:         glibc-2.3-regcomp.diff
-Patch10:        glibc-2.3.2-revert_tcsetattr.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch11:        glibc-2.3.1.localedef.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch12:        glibc-2.3.2.no_archive.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch13:        libm-x86-64.diff.bz2
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch14:        glibc-2.3.90-bindresvport.blacklist.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch15:        glibc-suse-note.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch16:        glibc-2.4.90-no_NO.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch17:        glibc-2.3.90-ld.so-madvise.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch18:        glibc-2.3.3-amd64-s_ceil.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch20:        glibc-2.4-china.diff
+# PATCH-FIX-OPENSUSE Fix gb18030 code bnc#54080
 Patch21:        glibc-2.3.4-gb18030-big5hkscs.diff.bz2
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 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
 Patch24:        glibc-2.3.5-nscd-zeronegtimeout.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch25:        glibc-2.3.90-langpackdir.diff
-Patch26:        glibc-nptl-2.4-nofixsyscallnr.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch27:        glibc-2.6-configure.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch28:        glibc-2.2-sunrpc.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch29:        glibc-2.8-getconf.diff
+# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697
 Patch30:        getaddrinfo-ipv6-sanity.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch31:        ppc-atomic.diff
-Patch32:        glibc-2.8-clone.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 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
 Patch37:        glibc-2.10-nscd-nostack.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 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-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch42:        glibc-statfs64-ia64.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch43:        missing-include-build-fix.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch44:        glibc-ppc64-vdso-time.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch45:        glibc-gai-private4.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch46:        glibc-resolv-mdnshint.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch47:        glibc-nscd-hconf.diff
-Patch48:	glibc-malloc-arena-max.diff
-Patch49:	glibc-fini-unwind.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch48:        glibc-malloc-arena-max.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch49:        glibc-fini-unwind.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch50:        glibc-gconvcache-s390.diff
-Patch51:	glibc-vfprintf-positional.diff
-Patch52:	glibc-elf-localscope.diff
-Patch53:	glibc-zarch-longlong.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch51:        glibc-vfprintf-positional.diff
+# FIX-OPENSUSE bnc#657627
+Patch52:        glibc-elf-localscope.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch53:        glibc-zarch-longlong.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch54:        glibc-disable-backward-memcpy.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch55:        glibc-bso-12454.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch56:        glibc-static-memcpy.diff
+# FIX-OPENSUSE compile some files with -fno-strict-aliasing
+Patch58:        glibc-strict-aliasing.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch500:       ARM_glibc-2.10.1-local-eabi-wchar.diff
-Patch501:       ARM_glibc-2.10.1-local-hwcap-updates.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

 %description
@@ -157,40 +214,31 @@ 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 info
 License:        GPLv2+
 Summary:        Info Files for the GNU C Library
 Group:          Documentation/Other
 PreReq:         %{install_info_prereq}
-AutoReqProv:    on

 %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
 complete and is partially out of date.

-
-
 %package html
 License:        GPLv2+ ; LGPLv2.1+
 Summary:        HTML Documentation for the GNU C Library
 Group:          Documentation/HTML
-AutoReqProv:    on

 %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
 partially out of date.

-
-
 %package i18ndata
 License:        LGPLv2.1+
 Summary:        Database Sources for 'locale'
 Group:          System/Libraries
-AutoReqProv:    on

 %description i18ndata
 This package contains the data needed to build the locale data files to
@@ -198,15 +246,12 @@ use the internationalization features of the GNU libc. It is normally
 not necessary to install this packages, the data files are already
 created.

-
-
 %package locale
 License:        GPLv2+ ; LGPLv2.1+
 Summary:        Locale Data for Localized Programs
 Group:          System/Libraries
-Requires:       glibc = %{version}
 PreReq:         /bin/cat
-AutoReqProv:    on
+Requires:       glibc = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      glibc-locale-64bit
@@ -218,21 +263,18 @@ Obsoletes:      glibc-locale-32bit
 %description locale
 Locale data for the internationalisation features of the GNU C library.

-
-
 %package -n nscd
 License:        LGPLv2.1+
 Summary:        Name Service Caching Daemon
 Group:          System/Daemons
-Provides:       glibc:/usr/sbin/nscd aaa_base:/etc/init.d/nscd
+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.

-
-
 %package profile
 License:        LGPLv2.1+
 Summary:        Libc Profiling and Debugging Versions
@@ -245,14 +287,11 @@ Obsoletes:      glibc-profile-64bit
 %ifarch ppc
 Obsoletes:      glibc-profile-32bit
 %endif
-AutoReqProv:    on

 %description profile
 This package contains special versions of the GNU C library which are
 necessary for profiling and debugging.

-
-
 %package devel
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
 Summary:        Include Files and Libraries Mandatory for Development
@@ -268,7 +307,6 @@ Obsoletes:      glibc-devel-32bit
 %endif
 PreReq:         /bin/rm
 Requires:       glibc = %{version}, linux-kernel-headers
-AutoReqProv:    on

 %description devel
 These libraries are needed to develop programs which use the standard C
@@ -276,9 +314,9 @@ library.

 %package utils
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
-Summary: 	Development utilities from GNU C library
+Summary:        Development utilities from GNU C library
 Group:          Development/Languages/C and C++
-Requires:       glibc = %{version}-%{release}
+Requires:       glibc = %{version}

 %description utils
 The glibc-utils package contains memusage, a memory usage profiler,
@@ -287,14 +325,12 @@ which can be helpful during program debugging.

 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}
-AutoReqProv:    on

 %description obsolete
 This package provides some old libraries from the GNU C Library which
@@ -330,8 +366,6 @@ versions of your software.
 %patch8
 # Seems not needed anymore
 #%patch9
-# Seems not needed anymore
-#%patch10
 %patch11
 %patch12
 %patch13 -E
@@ -353,14 +387,11 @@ touch -r nscd/nscd_stat.c nscd/s-stamp
 touch -r nscd/s-stamp nscd/nscd_stat.c
 rm nscd/s-stamp
 %patch25
-%patch26
 %patch27
 %patch28
 %patch29
 %patch30
 %patch31
-# Seems not needed anymore
-#%patch32
 %patch33
 %patch36
 %patch37
@@ -385,6 +416,7 @@ rm nscd/s-stamp
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
+%patch58
 %ifarch %arm armv5tel armv7l
 %patch500
 %patch501
@@ -432,7 +464,7 @@ echo "#define CVSDATE \"`date -r ChangeLog +%Y%m%d`\"" >> version.h
 #
 # Default CFLAGS and Compiler
 #
-BuildFlags="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE -fno-strict-aliasing"
+BuildFlags="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE"
 BuildFlags="$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')"
 BuildCC="gcc"
 BuildCCplus="g++"
@@ -515,7 +547,7 @@ configure_and_build_glibc() {
 		--enable-experimental-malloc \
 %endif
 		--with-tls --with-__thread --enable-kernel=%{enablekernel} \
-		--enable-bind-now 
+		--enable-bind-now
 # Should we enable --enable-nss-crypt to build use freebl3 hash functions?
 	make $PARALLEL
 	cd ..
@@ -567,7 +599,7 @@ make -C cc-base html
 #
 # Build glibc_post_upgrade binary
 #
-$BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgrade \
+$BuildCC -static $RPM_OPT_FLAGS -Os $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgrade \
     -Lcc-base -Bcc-base/csu \
    '-DREMOVE_TLS_DIRS' '-DREMOVE_PPC_OPTIMIZE_POWER5' \
 %ifarch ppc ppc64
@@ -804,6 +836,9 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT

+# Note: glibc_post_upgrade does:
+# %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
@@ -827,12 +862,16 @@ done

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

 %postun -n nscd
 %restart_on_update nscd
 %insserv_cleanup
 exit 0

+%verifyscript
+%verify_permissions -e %{_libdir}/pt_chown
+
 #######################################################################
 ###
 ### FILES
@@ -949,22 +988,22 @@ exit 0
 %endif # optimize_power
 %dir %attr(0700,root,root) /var/cache/ldconfig
 /sbin/ldconfig
-/usr/bin/gencat
-/usr/bin/getconf
-/usr/bin/getent
-/usr/bin/iconv
-%attr(755,root,root) /usr/bin/ldd
+%{_bindir}/gencat
+%{_bindir}/getconf
+%{_bindir}/getent
+%{_bindir}/iconv
+%attr(755,root,root) %{_bindir}/ldd
 %ifarch %ix86 sparc sparcv9
-	/usr/bin/lddlibc4
+	%{_bindir}/lddlibc4
 %endif
-/usr/bin/locale
-/usr/bin/localedef
-%attr(4755,root,root) %{_libdir}/pt_chown
+%{_bindir}/locale
+%{_bindir}/localedef
+%verify(not mode caps) %attr(4755,root,root) %{_libdir}/pt_chown
 %dir %attr(0755,root,root) %{_libdir}/getconf
 %{_libdir}/getconf/*
 %{_sbindir}/glibc_post_upgrade
 %{_sbindir}/rpcinfo
-/usr/sbin/iconvconfig
+%{_sbindir}/iconvconfig

 %ifarch %ix86
 %files obsolete
@@ -990,9 +1029,9 @@ exit 0
 %doc %{_mandir}/man1/rpcgen.1.gz
 %doc %{_mandir}/man1/sprof.1.gz
 %doc %{_mandir}/man3/*
-/usr/bin/catchsegv
-/usr/bin/rpcgen
-/usr/bin/sprof
+%{_bindir}/catchsegv
+%{_bindir}/rpcgen
+%{_bindir}/sprof
 %{_prefix}/include/*
 %{_libdir}/*.o
 %{_libdir}/*.so
@@ -1039,8 +1078,8 @@ exit 0
 %dir /etc/apparmor.d
 %config /etc/apparmor.d/usr.sbin.nscd
 %config /etc/init.d/nscd
-/usr/sbin/nscd
-/usr/sbin/rcnscd
+%{_sbindir}/nscd
+%{_sbindir}/rcnscd
 %dir %attr(0755,root,root) %ghost /var/run/nscd
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/nscd.pid
 %attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/socket
@@ -1067,10 +1106,10 @@ exit 0
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
 /%{_lib}/libpcprofile.so
-%{_prefix}/bin/memusage
-%{_prefix}/bin/memusagestat
-%{_prefix}/bin/mtrace
-%{_prefix}/bin/pcprofiledump
-%{_prefix}/bin/xtrace
+%{_bindir}/memusage
+%{_bindir}/memusagestat
+%{_bindir}/mtrace
+%{_bindir}/pcprofiledump
+%{_bindir}/xtrace

 %changelog