OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 19-Jul-2003 11:16:34
Branch: HEAD Handle: 2003071910163201
Modified files:
openpkg-src/tcl tcl.spec
openpkg-web news.txt
Log:
check build errors, fix config scripts, polishing
Summary:
Revision Changes Path
1.35 +16 -11 openpkg-src/tcl/tcl.spec
1.5661 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tcl/tcl.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 tcl.spec
--- openpkg-src/tcl/tcl.spec 8 Jul 2003 18:13:47 -0000 1.34
+++ openpkg-src/tcl/tcl.spec 19 Jul 2003 09:16:33 -0000 1.35
@@ -38,7 +38,7 @@
Group: Language
License: GPL
Version: %{V_major}.%{V_minor}.%{V_level}
-Release: 20030708
+Release: 20030719
# package options
%option with_x11 no
@@ -77,7 +77,7 @@
--includedir=%{l_prefix}/include/tcl \
--disable-shared
%{l_make} %{l_mflags -O}
- )
+ ) || exit $?
# build Tk (optional)
%if "%{with_x11}" == "yes"
@@ -88,12 +88,12 @@
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/tcl \
--disable-shared \
- --with-tcl=../../tcl%{V_major}.%{V_minor}.%{V_level}/unix
+ --with-tcl=../../tcl%{V_major}.%{V_minor}.%{V_level}/unix \
--with-x \
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
--x-libraries=`%{l_prefix}/etc/rc --query x11_libdir`
%{l_make} %{l_mflags -O}
- )
+ ) || exit $?
%endif
%install
@@ -101,8 +101,12 @@
# install Tcl
( cd tcl%{V_major}.%{V_minor}.%{V_level}/unix
+ %{l_shtool} subst \
+ -e 's;-L[^ ]*;-L%{l_prefix}/lib;g' \
+ -e
"s;\\(TCL_BUILD_STUB_LIB_PATH=\\).*;\\1'%{l_prefix}/lib/libtclstub%{V_major}.%{V_minor}\${TCL_DBGX}.a';"
\
+ tclConfig.sh
%{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
- )
+ ) || exit $?
( cd $RPM_BUILD_ROOT%{l_prefix}
mv bin/tclsh%{V_major}.%{V_minor} bin/tclsh
ln lib/libtcl%{V_major}.%{V_minor}.a lib/libtcl.a
@@ -119,16 +123,17 @@
mv $mp Tcl_$mp
fi
done
- )
- %{l_shtool} subst \
- -e "s;-L${RPM_BUILD_DIR};-L;" \
- $RPM_BUILD_ROOT%{l_prefix}/lib/tclConfig.sh
+ ) || exit $?
# install Tk (optional)
%if "%{with_x11}" == "yes"
( cd tk%{V_major}.%{V_minor}.%{V_level}/unix
+ %{l_shtool} subst \
+ -e 's;-L[^ ]*;-L%{l_prefix}/lib;g' \
+ -e
"s;\\(TK_BUILD_STUB_LIB_PATH=\\).*;\\1'%{l_prefix}/lib/libtkstub%{V_major}.%{V_minor}.a';"
\
+ tkConfig.sh
%{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
- )
+ ) || exit $?
( cd $RPM_BUILD_ROOT%{l_prefix}
mv bin/wish%{V_major}.%{V_minor} bin/wish
ln lib/libtk%{V_major}.%{V_minor}.a lib/libtk.a
@@ -146,7 +151,7 @@
mv $mp Tk_$mp
fi
done
- )
+ ) || exit $?
%endif
# post-process installation
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5660 -r1.5661 news.txt
--- openpkg-web/news.txt 19 Jul 2003 08:46:43 -0000 1.5660
+++ openpkg-web/news.txt 19 Jul 2003 09:16:32 -0000 1.5661
@@ -1,3 +1,4 @@
+19-Jul-2003: Upgraded package: P<tcl-8.4.3-20030719>
19-Jul-2003: Upgraded package: P<openpkg-tool-20030719-20030719>
19-Jul-2003: Upgraded package: P<delegate-8.5.6-20030719>
18-Jul-2003: Upgraded package: P<openpkg-20030718-20030718>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
