X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=1b361a55aeebfaafc2469cf79a6db46615d62327;hb=d326d83499a5f5f093d87a3edadae98778529cb9;hp=562915df5d3addfadcd197883788b1133386f651;hpb=97053a52f375fd893ffd2fc5d711c06c8e793f4e;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index 562915d..1b361a5 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -53,7 +53,7 @@ Summary(tr):	GNU libc
 Summary(uk):	GNU libc ×ÅÒÓ¦§ 2.3
 Name:		glibc
 Version:	2.3.3
-Release:	0.20040101.5%{?with_nptl:+nptl}
+Release:	0.20040101.9%{?with_nptl:+nptl}
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -96,6 +96,9 @@ Patch17:	%{name}-sparc-errno_fix.patch
 Patch18:	%{name}-make.patch
 Patch19:	%{name}-tests-io-tmp.patch
 Patch20:	%{name}-tests-noproc.patch
+Patch21:	%{name}-linuxthreads-ppc-fix.patch
+Patch22:	%{name}-alpha-sigaction.patch
+Patch23:	%{name}-new-charsets.patch
 URL:		http://www.gnu.org/software/libc/
 BuildRequires:	automake
 BuildRequires:	binutils >= 2.13.90.0.2
@@ -769,6 +772,9 @@ Statyczne 64-bitowe biblioteki GNU libc.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 chmod +x scripts/cpp
 
@@ -845,9 +851,7 @@ 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/%{_lib}
-mv $RPM_BUILD_ROOT/sbin/ldconfig 		$RPM_BUILD_ROOT/%{_lib}
-ln -s /%{_lib}/ldconfig 			$RPM_BUILD_ROOT/sbin
+install elf/postshell				$RPM_BUILD_ROOT/sbin
 
 %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so	$RPM_BUILD_ROOT%{_libdir}}
 %ifnarch sparc64
@@ -979,19 +983,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %ifnarch sparc64
 %ifarch amd64
-%post	-n %{name}64 -p /%{_lib}/postshell
+%post	-n %{name}64 -p /sbin/postshell
 %else
-%post	-p /%{_lib}/postshell
+%post	-p /sbin/postshell
 %endif
-/%{_lib}/ldconfig
+/sbin/ldconfig
 -/sbin/telinit u
 
 %ifarch amd64
-%postun	-n %{name}64 -p /%{_lib}/postshell
+%postun	-n %{name}64 -p /sbin/postshell
 %else
-%postun	-p /%{_lib}/postshell
+%postun	-p /sbin/postshell
 %endif
-/%{_lib}/ldconfig
+/sbin/ldconfig
 -/sbin/telinit u
 
 %post	memusage -p /sbin/ldconfig
@@ -1037,7 +1041,7 @@ fi
 # ld* and libc.so.6 SONAME symlinks must be in package because of
 # chicken-egg problem (postshell is dynamically linked with libc);
 # ld-*.so SONAME is ld.so.1 on ppc, ld-linux.so.2 on other archs
-%attr(755,root,root) /%{_lib}/postshell
+%attr(755,root,root) /sbin/postshell
 %attr(755,root,root) /%{_lib}/ld*
 %attr(755,root,root) /%{_lib}/libanl*
 %attr(755,root,root) /%{_lib}/libdl*