2.3.90-2

diff --git a/fedora/glibc-ppc-assume.patch b/fedora/glibc-ppc-assume.patch
index cfad4c907064528aa3e0fe22faf30de55cd09c67..49ae4975596431816fada4c4fe3133e1a2730c22 100644 (file)
--- a/fedora/glibc-ppc-assume.patch
+++ b/fedora/glibc-ppc-assume.patch
@@ -16,3 +16,14 @@
 +#if !defined __ASSUME_NEW_RT_SIGRETURN_SYSCALL && defined __powerpc64__
 +# define __ASSUME_NEW_RT_SIGRETURN_SYSCALL    1
 +#endif
+--- libc/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c.jj        2003-03-16 01:40:44.000000000 +0100
++++ libc/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c   2005-06-27 16:33:19.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+ 
+ #include "config.h"
+-#include "kernel-features.h"
++#include <kernel-features.h>
+ #include <ldsodefs.h>
+ 
+ extern int __cache_line_size;

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 8ee3964a69947ca3d6c63b17c653de1d100a81e8..b054a0b0b038d8cec3b252c9744ac6dfbf471ca1 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -472,13 +472,13 @@ if gcc -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
   BuildFlags="$BuildFlags -finline-limit=2000"
 fi
 EnableKernel="--enable-kernel=%{enablekernel}"
-echo "$BuildFlags" > ../BuildFlags
-echo "$GCC" > ../Gcc
-AddOns=`cd .. && echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
+echo "$BuildFlags" > BuildFlags
+echo "$GCC" > Gcc
+AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
 %ifarch %{rtkaioarches}
 AddOns=,rtkaio$AddOns
 %endif
-echo "$AddOns" > ../AddOns
+echo "$AddOns" > AddOns
 
 build_nptl()
 {
@@ -651,7 +651,7 @@ find $RPM_BUILD_ROOT -type f -or -type l |
 for n in %{_prefix}/share %{_prefix}/include %{_prefix}/lib/locale; do
     find ${RPM_BUILD_ROOT}${n} -type d | \
        grep -v '%{_prefix}/share$' | \
-       grep -v '\(%{_mandir}\|%{_infodir}\)' | \
+       grep -v '%{_infodir}' | \
        sed "s/^/%dir /" >> rpm.filelist.in
 done
 
@@ -692,14 +692,12 @@ grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full |
 grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist >> devel.filelist
 grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist
 grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist
-grep '%{_mandir}' < rpm.filelist >> devel.filelist
 
 mv rpm.filelist rpm.filelist.full
 grep -v '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist.full |
        grep -v '%{_prefix}/%{_lib}/.*\.o' |
        grep -v '%{_prefix}/%{_lib}/lib.*\.so'|
        grep -v '%{_prefix}/%{_lib}/linuxthreads' |
-       grep -v '%{_mandir}' |
        grep -v 'nscd' > rpm.filelist
 
 grep '%{_prefix}/bin' < rpm.filelist >> common.filelist
@@ -776,7 +774,7 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2
 # Increase timeouts
 export TIMEOUTFACTOR=16
 echo ====================TESTING=========================
-cd build-%{_target_cpu}-linuxnptl
+cd build-%{nptl_target_cpu}-linuxnptl
 make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || :
 cd ..
 %if %{buildxen}