Author: arekm Date: Tue Sep 6 17:31:56 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- 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.102 -> 1.103)
---- Diffs:
================================================================
Index: SPECS/tcl.spec
diff -u SPECS/tcl.spec:1.102 SPECS/tcl.spec:1.103
--- SPECS/tcl.spec:1.102 Sat Jun 18 21:18:25 2005
+++ SPECS/tcl.spec Tue Sep 6 19:31:50 2005
@@ -19,7 +19,6 @@
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
@@ -108,7 +107,6 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch6 -p1
%patch7 -p1
@@ -129,9 +127,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
@@ -142,6 +139,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
@@ -183,6 +189,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.103 2005/09/06 17:31:50 arekm
+- provide more complete internal headers set in includedir/tcl-private (tcl
needs for example it's own regexp.h)
+
Revision 1.102 2005/06/18 19:18:25 qboosh
- updated ieee patch is back
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/tcl.spec?r1=1.102&r2=1.103&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
