SPECS (AC-branch): tcl.spec - rel 2; provide more complete interna...

[arekm]

Author: arekm                        Date: Tue Sep  6 17:35:24 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rel 2; provide more complete internal headers set in includedir/tcl-private (tcl needs for example it's own regexp.h)

---- Files affected:
SPECS:
   tcl.spec (1.95.2.3 -> 1.95.2.4) 

---- Diffs:

================================================================
Index: SPECS/tcl.spec
diff -u SPECS/tcl.spec:1.95.2.3 SPECS/tcl.spec:1.95.2.4
--- SPECS/tcl.spec:1.95.2.3	Mon Jul  4 00:43:29 2005
+++ SPECS/tcl.spec	Tue Sep  6 19:35:19 2005
@@ -8,7 +8,7 @@
 Name:		tcl
 %define	major	8.4
 Version:	%{major}.11
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Languages/Tcl
 Source0:	http://dl.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
@@ -16,7 +16,6 @@
 Source1:	%{name}-pl-man-pages.tar.bz2
 # Source1-md5:	dd3370f2b588763758787831a4bf48fc
 Patch0:		%{name}-glibc21.patch
-Patch2:		%{name}-headers_fix.patch
 Patch3:		%{name}-opt.patch
 Patch4:		%{name}-ac25x.patch
 Patch5:		%{name}-mannames.patch
@@ -104,7 +103,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch0 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -125,9 +123,8 @@
 %{__make} \
 	TCL_PACKAGE_PATH="%{_libdir} %{_libdir}/tcl%{major} %{_ulibdir} %{_ulibdir}/tcl%{major}"
 
-sed -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#; \
-	s#%{_builddir}/%{name}%{version}#%{_includedir}#" tclConfig.sh > tclConfig.sh.new
-mv -f tclConfig.sh.new tclConfig.sh
+sed -i -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#; \
+	s#%{_builddir}/%{name}%{version}#%{_includedir}#" tclConfig.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +135,15 @@
 	TCL_PACKAGE_PATH="%{_libdir} %{_libdir}/tcl%{major} %{_ulibdir} %{_ulibdir}/tcl%{major}" \
 	MAN_INSTALL_DIR=$RPM_BUILD_ROOT%{_mandir}
 
+install -d $RPM_BUILD_ROOT%{_includedir}/%{name}-private/{generic,unix}
+find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT%{_includedir}/%{name}-private/'{}' ';'
+for h in $RPM_BUILD_ROOT%{_includedir}/*.h; do
+        rh=$(basename "$h")
+        if [ -f "$RPM_BUILD_ROOT%{_includedir}/%{name}-private/generic/$rh" ]; then
+                ln -sf "../../$rh" $RPM_BUILD_ROOT%{_includedir}/%{name}-private/generic
+        fi
+done
+
 ln -sf libtcl%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtcl.so
 ln -sf libtcl%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtcl%{major}.so
 mv -f $RPM_BUILD_ROOT%{_bindir}/tclsh%{major} $RPM_BUILD_ROOT%{_bindir}/tclsh
@@ -178,6 +184,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.4  2005/09/06 17:35:19  arekm
+- rel 2; provide more complete internal headers set in includedir/tcl-private (tcl needs for example it's own regexp.h)
+
 Revision 1.95.2.3  2005/07/03 22:43:29  arekm
 - up for 8.4.11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tcl.spec?r1=1.95.2.3&r2=1.95.2.4&f=u