SPECS (GLIBC_for_AC): glibc.spec 2.5 for ac

[arekm]

Author: arekm                        Date: Sun Dec 17 15:57:59 2006 GMT
Module: SPECS                         Tag: GLIBC_for_AC
---- Log message:
2.5 for ac

---- Files affected:
SPECS:
   glibc.spec (1.664 -> 1.664.2.1) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.664 SPECS/glibc.spec:1.664.2.1
--- SPECS/glibc.spec:1.664	Mon Nov 13 15:56:53 2006
+++ SPECS/glibc.spec	Sun Dec 17 16:57:53 2006
@@ -31,6 +31,8 @@
 #   debug/backtrace-tst(SEGV)  fail on alpha
 %{!?min_kernel:%global		min_kernel	2.6.12}
 
+%define	__cc	gcc4
+
 %ifarch sparc64
 %undefine	with_memusage
 %endif
@@ -95,7 +97,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	binutils >= 2:2.15.90.0.3
-BuildRequires:	gcc >= 5:3.4
+BuildRequires:	gcc4 >= 5:3.4
 BuildRequires:	gawk
 %{?with_memusage:BuildRequires:	gd-devel >= 2.0.1}
 BuildRequires:	gettext-devel >= 0.10.36
@@ -103,7 +105,7 @@
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 BuildRequires:	linux-libc-headers >= %{llh_version}
 BuildRequires:	perl-base
-BuildRequires:	rpm-build >= 4.3-0.20030610.28
+BuildRequires:	rpm-build >= 4.2
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.315
 BuildRequires:	sed >= 4.0.5
@@ -119,7 +121,6 @@
 Provides:	ldconfig
 Obsoletes:	glibc-common
 Obsoletes:	glibc-debug
-Obsoletes:	glibc64
 Obsoletes:	ldconfig
 Conflicts:	kernel < %{min_kernel}
 Conflicts:	kernel24
@@ -824,6 +825,35 @@
 %description memusage -l pl
 Zabawka.
 
+%package -n %{name}64
+Summary:       GNU libc - 64-bit libraries
+Summary(es):   GNU libc - bibliotecas de 64 bits
+Summary(pl):   GNU libc - biblioteki 64-bitowe
+Group:         Libraries
+Requires:      %{name}-misc = %{epoch}:%{version}-%{release}
+Requires:      basesystem
+Provides:      glibc = %{epoch}:%{version}-%{release}
+Provides:	glibc(tls)
+Provides:      ldconfig
+Obsoletes:     glibc-common
+Obsoletes:     glibc-debug
+Obsoletes:     ldconfig
+Conflicts:     kernel < %{min_kernel}
+Conflicts:     ld.so < 1.9.9-10
+Conflicts:     man-pages < 1.43
+Conflicts:     poldek < 0.18.8-4
+Conflicts:     rc-scripts < 0.3.1-13
+Conflicts:     rpm < 4.1
+
+%description -n %{name}64
+64-bit GNU libc libraries for 64bit architecture.
+
+%description -n %{name}64 -l es
+Bibliotecas GNU libc de 64 bits para la arquitectura 64bit.
+
+%description -n %{name}64 -l pl
+Biblioteki 64-bitowe GNU libc dla architektury 64bit.
+
 %prep
 %setup -q -a1
 ln -s glibc-libidn-%{version} libidn
@@ -1056,16 +1086,28 @@
 # when %%postun is run
 
 %if !%{with cross}
+%ifarch %{x8664} ppc64 s390x sparc64
+%post  -n %{name}64 -p /sbin/postshell
+%else
 %post	-p /sbin/postshell
+%endif
 /sbin/glibc-postinst /%{_lib}/%{_host_cpu}
 /sbin/ldconfig
 -/sbin/telinit u
 
+%ifarch %{x8664} ppc64 s390x sparc64
+%postun        -n %{name}64 -p /sbin/postshell
+%else
 %postun	-p /sbin/postshell
+%endif
 /sbin/ldconfig
 -/sbin/telinit u
 
+%ifarch %{x8664} ppc64 s390x sparc64
+%triggerpostun -n %{name}64 -p /sbin/postshell -- glibc-misc < 6:2.3.5-7.6
+%else
 %triggerpostun -p /sbin/postshell -- glibc-misc < 6:2.3.5-7.6
+%endif
 -/bin/cp -f /etc/ld.so.conf /etc/ld.so.conf.rpmsave
 -/bin/sed -i -e '1iinclude ld.so.conf.d/*.conf' /etc/ld.so.conf
 %endif
@@ -1105,7 +1147,11 @@
 	%groupremove nscd
 fi
 
+%ifarch %{x8664} ppc64 s390x sparc64
+%files -n %{name}64
+%else
 %files
+%endif
 %defattr(644,root,root,755)
 %doc README NEWS FAQ BUGS
 %if !%{with cross}
@@ -1459,6 +1505,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.664.2.1  2006/12/17 15:57:53  arekm
+2.5 for ac
+
 Revision 1.664  2006/11/13 14:56:53  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 
================================================================

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