SPECS (DEVEL): glibc.spec - postshell/postinst almost fixed.

[pluto]

Author: pluto                        Date: Tue Mar  7 21:55:51 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- postshell/postinst almost fixed.

---- Files affected:
SPECS:
   glibc.spec (1.590.2.35 -> 1.590.2.36) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.590.2.35 SPECS/glibc.spec:1.590.2.36
--- SPECS/glibc.spec:1.590.2.35	Tue Mar  7 21:50:27 2006
+++ SPECS/glibc.spec	Tue Mar  7 22:55:45 2006
@@ -880,8 +880,8 @@
 
 %if %{without cross}
 # compiling static using klibc vs glibc saves 490k
-klcc %{__cc} %{SOURCE8} %{rpmcflags} -static -o postshell
-klcc %{__cc} %{SOURCE9} %{rpmcflags} -static -o glibc-postinst
+klcc %{SOURCE8} %{rpmcflags} -static -o postshell
+klcc %{SOURCE9} %{rpmcflags} -static -o glibc-postinst
 %endif
 
 %install
@@ -908,10 +908,13 @@
 install $PICFILES				$RPM_BUILD_ROOT%{_libdir}
 install elf/soinit.os				$RPM_BUILD_ROOT%{_libdir}/soinit.o
 install elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
-
-install elf/postshell				$RPM_BUILD_ROOT/sbin
 cd ..
 
+%if %{without cross}
+install postshell				$RPM_BUILD_ROOT/sbin
+install glibc-postinst				$RPM_BUILD_ROOT/sbin
+%endif
+
 %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so  $RPM_BUILD_ROOT%{_libdir}}
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so	$RPM_BUILD_ROOT%{_libdir}
 
@@ -1034,7 +1037,9 @@
 # don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
 # when %%postun is run
 
+%if %{without cross}
 %post	-p /sbin/postshell
+/sbin/glibc-postinst /%{_lib}/%{_host_cpu}
 /sbin/ldconfig
 -/sbin/telinit u
 
@@ -1045,6 +1050,7 @@
 %triggerpostun -p /sbin/postshell -- glibc-misc < 6:2.3.4-0.20040505.1
 -/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
@@ -1084,7 +1090,10 @@
 %files
 %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);
@@ -1417,6 +1426,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.590.2.36  2006/03/07 21:55:45  pluto
+- postshell/postinst almost fixed.
+
 Revision 1.590.2.35  2006/03/07 20:50:27  pluto
 - fix postshell/postinst build. use klibc for smaller binaries.
 
================================================================

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