SPECS: glibc.spec - update from AC-branch: - add code that makes ...
glen
glen at pld-linux.org
Sat Jun 18 23:48:17 CEST 2005
Author: glen Date: Sat Jun 18 21:48:17 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- update from AC-branch:
- add code that makes it possible do major upgrade (glibc 2.2 -> glibc 2.3) on systems with /lib/%{arch}
---- Files affected:
SPECS:
glibc.spec (1.602 -> 1.603)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.602 SPECS/glibc.spec:1.603
--- SPECS/glibc.spec:1.602 Sun Jun 12 04:08:11 2005
+++ SPECS/glibc.spec Sat Jun 18 23:48:12 2005
@@ -76,7 +76,7 @@
Summary(uk): GNU libc ×ĹŇÓŚ§ 2.3
Name: glibc
Version: 2.3.5
-Release: 2.1
+Release: 2.2
Epoch: 6
License: LGPL
Group: Libraries
@@ -94,6 +94,8 @@
Source6: %{name}-non-english-man-pages.tar.bz2
# Source6-md5: 6159f0a9b6426b5f6fc1b0d8d21b9b76
Source7: %{name}-localedb-gen
+Source8: %{name}-LD-path.c
+Source9: postshell.c
Patch0: %{name}-info.patch
Patch1: %{name}-pl.po-update.patch
Patch2: %{name}-pld.patch
@@ -101,7 +103,6 @@
Patch4: %{name}-linuxthreads-lock.patch
Patch5: %{name}-pthread_create-manpage.patch
Patch6: %{name}-paths.patch
-Patch7: %{name}-postshell.patch
Patch8: %{name}-missing-nls.patch
Patch9: %{name}-java-libc-wait.patch
Patch10: %{name}-lthrds_noomit.patch
@@ -150,6 +151,7 @@
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
+BuildRequires: dietlibc-static
AutoReq: false
PreReq: basesystem
Requires: glibc-misc = %{epoch}:%{version}-%{release}
@@ -779,7 +781,6 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
@@ -879,6 +880,10 @@
done
%endif
+# 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
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig},%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd}
@@ -903,10 +908,11 @@
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 ..
+install postshell $RPM_BUILD_ROOT/sbin
+install glibc-postinst $RPM_BUILD_ROOT/sbin
+
%if %{with dual}
env LANGUAGE=C LC_ALL=C \
%{__make} -C builddir-nptl install \
@@ -1081,6 +1087,7 @@
%else
%post -p /sbin/postshell
%endif
+/sbin/glibc-postinst /%{_lib}/%{_host_cpu}
/sbin/ldconfig
-/sbin/telinit u
@@ -1150,6 +1157,7 @@
%defattr(644,root,root,755)
%doc README NEWS FAQ BUGS
%attr(755,root,root) /sbin/postshell
+%attr(755,root,root) /sbin/glibc-postinst
%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);
@@ -1485,6 +1493,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.603 2005/06/18 21:48:12 glen
+- update from AC-branch:
+ - add code that makes it possible do major upgrade (glibc 2.2 -> glibc 2.3) on systems with /lib/%{arch}
+
Revision 1.602 2005/06/12 02:08:11 ankry
- more locale dirs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.602&r2=1.603&f=u
More information about the pld-cvs-commit
mailing list