SPECS (AC-branch): glibc.spec - we want nptl headers to be default...

[arekm]

Author: arekm                        Date: Sun Dec 17 01:18:41 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- we want nptl headers to be default one

---- Files affected:
SPECS:
   glibc.spec (1.583.2.84 -> 1.583.2.85) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.84 SPECS/glibc.spec:1.583.2.85
--- SPECS/glibc.spec:1.583.2.84	Wed Oct 18 09:24:34 2006
+++ SPECS/glibc.spec	Sun Dec 17 02:18:35 2006
@@ -1031,6 +1031,7 @@
 cd builddir
 env LANGUAGE=C LC_ALL=C \
 %{__make} install \
+	%{?with_dual:includedir=/inc-linuxthreads} \
 	install_root=$RPM_BUILD_ROOT \
 	infodir=%{_infodir} \
 	mandir=%{_mandir}
@@ -1060,7 +1061,7 @@
 	cross-compiling=yes \
 	install_root=$RPM_BUILD_ROOT/nptl
 
-install -d $RPM_BUILD_ROOT{/%{_lib}/tls,%{_libdir}/nptl,%{_includedir}/nptl}
+install -d $RPM_BUILD_ROOT{/%{_lib}/tls,%{_libdir}/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
@@ -1076,16 +1077,20 @@
 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/nptl%{_prefix}/include
+cd $RPM_BUILD_ROOT/inc-linuxthreads
 	for f in `find . -type f`; do
-		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
+		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
 		fi
 	done
 cd -
-rm -rf $RPM_BUILD_ROOT/nptl
+mv $RPM_BUILD_ROOT/nptl%{_prefix}/include $RPM_BUILD_ROOT%{_prefix}/include
+rm -rf $RPM_BUILD_ROOT/{nptl,inc-linuxthreads}
 %endif
 
 %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so	$RPM_BUILD_ROOT%{_libdir}}
@@ -1568,7 +1573,7 @@
 %{_includedir}/sys
 
 %if %{with dual}
-%{_includedir}/nptl
+%{_includedir}/linuxthreads
 %endif
 
 %files devel-utils
@@ -1687,6 +1692,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.85  2006/12/17 01:18:35  arekm
+- we want nptl headers to be default one
+
 Revision 1.583.2.84  2006/10/18 07:24:34  blekot
 - added -p1 to %patch29
 
================================================================

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