- provide more complete internal headers set in includedir/tcl-private (tcl needs...

Changed files:
    tcl.spec -> 1.103

diff --git a/tcl.spec b/tcl.spec
index 809d2c845782093d9bce84d918b9c8eb459bbde4..1e29366c52610e8177d18fda7fafa934060010e2 100644 (file)
--- a/tcl.spec
+++ b/tcl.spec
@@ -18,7 +18,6 @@ Source1:      %{name}-pl-man-pages.tar.bz2
 Patch0:                %{name}-glibc21.patch
 Patch1:                %{name}-ieee.patch
 Patch2:                %{name}-readline.patch
-Patch3:                %{name}-headers_fix.patch
 Patch4:                %{name}-opt.patch
 Patch6:                %{name}-mannames.patch
 Patch7:                %{name}-soname_fix.patch
@@ -107,7 +106,6 @@ Pliki nag
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
@@ -128,9 +126,8 @@ mv -f Makefile.in.new Makefile.in
 %{__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
@@ -141,6 +138,15 @@ install -d $RPM_BUILD_ROOT{%{_prefix},%{_mandir}/man1}
        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