SPECS (AC-branch): glibc.spec - revert nptl headers being first (b...

[arekm]

Author: arekm                        Date: Fri Jan 19 21:10:09 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- revert nptl headers being first (breaks things)

---- Files affected:
SPECS:
   glibc.spec (1.583.2.86 -> 1.583.2.87) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.86 SPECS/glibc.spec:1.583.2.87
--- SPECS/glibc.spec:1.583.2.86	Mon Jan  8 13:05:40 2007
+++ SPECS/glibc.spec	Fri Jan 19 22:10:03 2007
@@ -87,7 +87,7 @@
 Summary(uk):	GNU libc ×ĹŇÓŚ§ 2.3
 Name:		glibc
 Version:	2.3.6
-Release:	10
+Release:	11
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -1031,7 +1031,6 @@
 cd builddir
 env LANGUAGE=C LC_ALL=C \
 %{__make} install \
-	%{?with_dual:includedir=/inc-linuxthreads} \
 	install_root=$RPM_BUILD_ROOT \
 	infodir=%{_infodir} \
 	mandir=%{_mandir}
@@ -1061,7 +1060,7 @@
 	cross-compiling=yes \
 	install_root=$RPM_BUILD_ROOT/nptl
 
-install -d $RPM_BUILD_ROOT{/%{_lib}/tls,%{_libdir}/nptl}
+install -d $RPM_BUILD_ROOT{/%{_lib}/tls,%{_libdir}/nptl,%{_includedir}/nptl}
 for f in libc libm libpthread libthread_db librt; do
 	mv -f $RPM_BUILD_ROOT/nptl/%{_lib}/${f}[-.]* $RPM_BUILD_ROOT/%{_lib}/tls
 done
@@ -1077,20 +1076,16 @@
 for f in libc.a libpthread.a libpthread_nonshared.a; do
 	mv -f $RPM_BUILD_ROOT/nptl%{_libdir}/$f $RPM_BUILD_ROOT%{_libdir}/nptl
 done
-cd $RPM_BUILD_ROOT/inc-linuxthreads
+cd $RPM_BUILD_ROOT/nptl%{_prefix}/include
 	for f in `find . -type f`; do
-		echo "XXX $f XXX"
-		if ! [ -f $RPM_BUILD_ROOT/nptl/%{_prefix}/include/$f ]; then
-			install -d $RPM_BUILD_ROOT/nptl%{_prefix}/include/linuxthreads/`dirname $f`
-			cp -a $f $RPM_BUILD_ROOT/nptl%{_prefix}/include/linuxthreads/$f
-		elif ! cmp -s $f $RPM_BUILD_ROOT/nptl%{_prefix}/include/$f ; then
-			install -d $RPM_BUILD_ROOT/nptl%{_prefix}/include/linuxthreads/`dirname $f`
-			cp -a $f $RPM_BUILD_ROOT/nptl%{_prefix}/include/linuxthreads/$f
+		if ! [ -f $RPM_BUILD_ROOT%{_prefix}/include/$f ] \
+		   || ! cmp -s $f $RPM_BUILD_ROOT%{_prefix}/include/$f ; then
+			install -d $RPM_BUILD_ROOT%{_prefix}/include/nptl/`dirname $f`
+			cp -a $f $RPM_BUILD_ROOT%{_prefix}/include/nptl/$f
 		fi
 	done
 cd -
-mv $RPM_BUILD_ROOT/nptl%{_prefix}/include $RPM_BUILD_ROOT%{_prefix}/include
-rm -rf $RPM_BUILD_ROOT/{nptl,inc-linuxthreads}
+rm -rf $RPM_BUILD_ROOT/nptl
 %endif
 
 %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so	$RPM_BUILD_ROOT%{_libdir}}
@@ -1574,7 +1569,7 @@
 %{_includedir}/sys
 
 %if %{with dual}
-%{_includedir}/linuxthreads
+%{_includedir}/nptl
 %endif
 
 %files devel-utils
@@ -1693,6 +1688,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.87  2007/01/19 21:10:03  arekm
+- revert nptl headers being first (breaks things)
+
 Revision 1.583.2.86  2007/01/08 12:05:40  glen
 - fix localedb-gen script for amd64; rel 10
 
================================================================

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