SPECS (AC-branch): glibc.spec - merge from HEAD: /sbin/postshell m...

[glen]

Author: glen                         Date: Wed Sep  6 16:26:47 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from HEAD: /sbin/postshell moved to setup package; rel 7

---- Files affected:
SPECS:
   glibc.spec (1.583.2.78 -> 1.583.2.79) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.78 SPECS/glibc.spec:1.583.2.79
--- SPECS/glibc.spec:1.583.2.78	Wed May 24 20:34:51 2006
+++ SPECS/glibc.spec	Wed Sep  6 18:26:41 2006
@@ -87,7 +87,7 @@
 Summary(uk):	GNU libc ×ĹŇÓŚ§ 2.3
 Name:		glibc
 Version:	2.3.6
-Release:	6
+Release:	7
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -103,7 +103,6 @@
 # Source5-md5:	f464eadf3cf06761f65639e44a179e6b
 Source6:	%{name}-localedb-gen
 Source7:	%{name}-LD-path.c
-Source8:	postshell.c
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -1009,9 +1008,7 @@
 %endif
 
 %if %{without cross}
-# compiling static using diet vs glibc saves 400k
-diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o postshell
-diet -Os %{__cc} %{SOURCE7} %{rpmcflags} -static -o glibc-postinst
+diet %{__cc} %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
 %endif
 
 %install
@@ -1041,7 +1038,6 @@
 cd ..
 
 %if %{without cross}
-install postshell					$RPM_BUILD_ROOT/sbin
 install glibc-postinst				$RPM_BUILD_ROOT/sbin
 %endif
 
@@ -1311,7 +1307,6 @@
 %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
@@ -1679,6 +1674,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.79  2006/09/06 16:26:41  glen
+- merge from HEAD: /sbin/postshell moved to setup package; rel 7
+
 Revision 1.583.2.78  2006/05/24 18:34:51  qboosh
 - added dirs for dz,km,mg,zh_HK messages (merged from HEAD)
 
================================================================

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