SPECS (DEVEL): glibc.spec - glibc 2.3.90 has stubs split.

[pluto]

Author: pluto                        Date: Mon Jan 23 11:23:00 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- glibc 2.3.90 has stubs split.

---- Files affected:
SPECS:
   glibc.spec (1.590.2.28 -> 1.590.2.29) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.590.2.28 SPECS/glibc.spec:1.590.2.29
--- SPECS/glibc.spec:1.590.2.28	Sun Jan 22 22:40:59 2006
+++ SPECS/glibc.spec	Mon Jan 23 12:22:55 2006
@@ -6,7 +6,6 @@
 %bcond_with	tests		# perform "make test"
 %bcond_without	localedb	# don't build localedb-all (is time consuming)
 %bcond_with	cross		# build using crossgcc (without libgcc_eh)
-
 #
 # TODO:
 # - look at locale fixes/updates in bugzilla
@@ -29,7 +28,7 @@
 Name:		glibc
 Version:	2.3.90
 %define		_snap	20051204T1150UTC
-Release:	0.%{_snap}.3
+Release:	0.%{_snap}.4
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -397,7 +396,7 @@
 Group:		Documentation
 Provides:	%{name}-devel-doc(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 %ifarch %{x8664}
-# If both -m32 and -m64 is to be supported on AMD64, x86_64 package
+# If both -m32 and -m64 is to be supported on x86_64 package
 # have to be installed, not ix86 one.
 Obsoletes:	%{name}-devel-doc(i386)
 Obsoletes:	%{name}-devel-doc(i486)
@@ -888,31 +887,6 @@
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo/{localtime,posixtime,posixrules,posix/*}
 
-%ifarch %{ix86} ppc s390 sparc sparcv9
-mv $RPM_BUILD_ROOT%{_includedir}/gnu/{stubs.h,stubs-32.h}
-%endif
-
-%ifarch %{x8664} ppc64 s390x sparc64
-mv $RPM_BUILD_ROOT%{_includedir}/gnu/{stubs.h,stubs-64.h}
-%endif
-
-%ifarch %{ix86} %{x8664} ppc ppc64 s390 s390x sparc sparcv9 sparc64
-cat <<EOF >$RPM_BUILD_ROOT%{_includedir}/gnu/stubs.h
-/* This file selects the right generated file of '__stub_FUNCTION' macros
-   based on the architecture being compiled for.  */
-
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-# include <gnu/stubs-32.h>
-#elif __WORDSIZE == 64
-# include <gnu/stubs-64.h>
-#else
-# error "unexpected value for __WORDSIZE macro"
-#endif
-EOF
-%endif
-
 ln -sf %{_sysconfdir}/localtime	$RPM_BUILD_ROOT%{_datadir}/zoneinfo/localtime
 ln -sf localtime		$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime
 ln -sf localtime		$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
@@ -936,7 +910,7 @@
 bzip2 -dc %{SOURCE6} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
-echo 'include ld.so.conf.d/*.conf'> $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf
+echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf
 rm -f $RPM_BUILD_ROOT%{_mandir}/hu/man7/man.7
 
 :> $RPM_BUILD_ROOT/var/log/nscd
@@ -1406,6 +1380,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.590.2.29  2006/01/23 11:22:55  pluto
+- glibc 2.3.90 has stubs split.
+
 Revision 1.590.2.28  2006/01/22 21:40:59  pluto
 - multilib split merged from head (i hope correctly).
 - use glibc instead of glibc64 for th.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.590.2.28&r2=1.590.2.29&f=u