rpms/glibc/devel glibc.spec,1.164,1.165

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27565

Modified Files:
	glibc.spec 
Log Message:
2.3.90-2



Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- glibc.spec	8 Jul 2005 10:17:59 -0000	1.164
+++ glibc.spec	8 Jul 2005 10:21:35 -0000	1.165
@@ -477,13 +477,13 @@
   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()
 {
@@ -656,7 +656,7 @@
 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
 
@@ -697,14 +697,12 @@
 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
@@ -781,7 +779,7 @@
 # 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}