SPECS: glibc.spec - merged ppc64/s390x/sparc64 multilib and cross ...

[qboosh]

Author: qboosh                       Date: Tue Nov 15 11:05:49 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged ppc64/s390x/sparc64 multilib and cross changes from AC-branch

---- Files affected:
SPECS:
   glibc.spec (1.620 -> 1.621) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.620 SPECS/glibc.spec:1.621
--- SPECS/glibc.spec:1.620	Tue Nov 15 11:05:31 2005
+++ SPECS/glibc.spec	Tue Nov 15 12:05:44 2005
@@ -129,7 +129,7 @@
 Patch29:	%{name}-pax_dl-execstack.patch
 Patch30:	%{name}-large_collate_tables.patch
 URL:		http://www.gnu.org/software/libc/
-BuildRequires:	audit-libs-devel
+%{?with_selinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	binutils >= 2:2.15.90.0.3
@@ -398,6 +398,15 @@
 Obsoletes:	%{name}-headers(pentium3)
 Obsoletes:	%{name}-headers(pentium4)
 %endif
+%ifarch ppc64
+Obsoletes:	%{name}-headers(ppc)
+%endif
+%ifarch s390x
+Obsoletes:	%{name}-headers(s390)
+%endif
+%ifarch sparc64
+Obsoletes:	%{name}-headers(sparc)
+%endif
 %{!?with_kernelheaders:Requires:	linux-libc-headers >= %{llh_version}}
 
 %description headers
@@ -437,6 +446,15 @@
 Obsoletes:	%{name}-devel-utils(pentium3)
 Obsoletes:	%{name}-devel-utils(pentium4)
 %endif
+%ifarch ppc64
+Obsoletes:	%{name}-devel-utils(ppc)
+%endif
+%ifarch s390x
+Obsoletes:	%{name}-devel-utils(s390)
+%endif
+%ifarch sparc64
+Obsoletes:	%{name}-devel-utils(sparc)
+%endif
 
 %description devel-utils
 The glibc-devel-utils package contains utilities necessary for
@@ -474,6 +492,15 @@
 Obsoletes:	%{name}-devel-doc(pentium3)
 Obsoletes:	%{name}-devel-doc(pentium4)
 %endif
+%ifarch ppc64
+Obsoletes:	%{name}-devel-doc(ppc)
+%endif
+%ifarch s390x
+Obsoletes:	%{name}-devel-doc(s390)
+%endif
+%ifarch sparc64
+Obsoletes:	%{name}-devel-doc(sparc)
+%endif
 
 %description devel-doc
 The glibc-devel-doc package contains info and manual pages necessary
@@ -992,9 +1019,11 @@
 done
 %endif
 
+%if %{without cross}
 # compiling static using diet vs glibc saves 400k
 diet -Os %{__cc} %{SOURCE9} %{rpmcflags} -static -o postshell
 diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o glibc-postinst
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1022,8 +1051,10 @@
 install elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
 cd ..
 
+%if %{without cross}
 install postshell					$RPM_BUILD_ROOT/sbin
 install glibc-postinst				$RPM_BUILD_ROOT/sbin
+%endif
 
 %if %{with dual}
 env LANGUAGE=C LC_ALL=C \
@@ -1226,6 +1257,7 @@
 # don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
 # when %%postun is run
 
+%if %{without cross}
 %ifarch %{x8664} ppc64 s390x sparc64
 %post	-n %{name}64 -p /sbin/postshell
 %else
@@ -1257,6 +1289,7 @@
 %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
 
 %post	memusage -p /sbin/ldconfig
 %postun memusage -p /sbin/ldconfig
@@ -1308,8 +1341,10 @@
 %endif
 %defattr(644,root,root,755)
 %doc README NEWS FAQ BUGS
+%if %{without cross}
 %attr(755,root,root) /sbin/postshell
 %attr(755,root,root) /sbin/glibc-postinst
+%endif
 %attr(755,root,root) /sbin/ldconfig
 # ld* and libc.so.6 SONAME symlinks must be in package because of
 # chicken-egg problem (postshell is dynamically linked with libc);
@@ -1661,6 +1696,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.621  2005/11/15 11:05:44  qboosh
+- merged ppc64/s390x/sparc64 multilib and cross changes from AC-branch
+
 Revision 1.620  2005/11/15 10:05:31  ankry
 - Swahili supported
 
================================================================

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