OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 10:20:08
Branch: HEAD Handle: 2007122209200701
Added files:
openpkg-src/expect expect.patch
Modified files:
openpkg-src/expect expect.spec
Log:
unbreak under Tcl 8.5 world order and at the same time finally get rid
of the link-time vs. run-time issue; also fix name of manual page
Summary:
Revision Changes Path
1.3 +12 -0 openpkg-src/expect/expect.patch
1.56 +19 -15 openpkg-src/expect/expect.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/expect/expect.patch
============================================================================
$ cvs diff -u -r0 -r1.3 expect.patch
--- /dev/null 2007-12-22 10:19:00 +0100
+++ expect.patch 2007-12-22 10:20:08 +0100
@@ -0,0 +1,12 @@
+Index: tcl8.4.16/unix/configure
+--- tcl8.4.16/unix/configure.orig 2007-09-21 19:07:02 +0200
++++ tcl8.4.16/unix/configure 2007-12-22 10:09:33 +0100
+@@ -9150,7 +9150,7 @@
+ DBGX='${TCL_DBGX}'
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++TCL_LIBRARY='$(prefix)/lib/expect/tcl'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/expect/expect.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 expect.spec
--- openpkg-src/expect/expect.spec 22 Sep 2007 09:38:32 -0000 1.55
+++ openpkg-src/expect/expect.spec 22 Dec 2007 09:20:08 -0000 1.56
@@ -22,15 +22,6 @@
## SUCH DAMAGE.
##
-# ATTENTION: Expect is brain-dead: it requires private Tcl information
-# (tclInt.h) which only can be found in the Tcl sources on the one
-# hand and it requires the Tcl installation files under run-time on
-# the other hand (which can be provided by the Tcl package). This
-# means we have to do something very strange: include the Tcl source
-# and use it for building and requiring the Tcl package for use under
-# run-time. Hence we require _exactly_ a particular Tcl version. Keep
-# this in sync!
-
# package versions
%define V_expect_tar 5.43.0
%define V_expect_dir 5.43
@@ -47,17 +38,18 @@
Group: Language
License: GPL
Version: %{V_expect_tar}
-Release: 20070922
+Release: 20071222
# list of sources
Source0: http://expect.nist.gov/src/expect-%{V_expect_tar}.tar.gz
Source1: http://switch.dl.sourceforge.net/tcl/tcl%{V_tcl}-src.tar.gz
+Patch0: expect.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, tcl = %{V_tcl}
-PreReq: OpenPKG, openpkg >= 20040130, tcl >= %{V_tcl}
+BuildPreReq: OpenPKG, openpkg >= 20040130
+PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
@@ -69,7 +61,7 @@
%track
prog expect:expect = {
- comment = "rse: 5.44.0-5.44.1: has optional X11/Tk support but
fails to build without it"
+ comment = "rse: 5.44.x was withdrawn and failed to build anyway"
version = %{version}
url = http://expect.nist.gov/src/
regex = expect-(__VER__)\.tar\.gz
@@ -77,12 +69,13 @@
prog expect:tcl = {
version = %{V_tcl}
url = http://prdownloads.sourceforge.net/tcl/
- regex = tcl(\d+\.\d+(\.\d+)?)-src\.tar.gz
+ regex = tcl(8\.4\.\d+)-src\.tar.gz
}
%prep
%setup -q -c
%setup -q -T -D -a 1
+ %patch -p0
%build
( cd tcl%{V_tcl}/unix
@@ -90,6 +83,8 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
+ --includedir=%{l_prefix}/include/expect/tcl \
+ --libdir=%{l_prefix}/lib/expect/tcl \
--disable-threads \
--disable-load \
--disable-shared
@@ -109,6 +104,15 @@
%install
rm -rf $RPM_BUILD_ROOT
+ ( cd tcl%{V_tcl}/unix
+ %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/mann
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/tclsh.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/tclsh*
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/expect
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/expect/tcl/libtcl*
+ ) || exit $?
( cd expect-%{V_expect_dir}
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
@@ -116,7 +120,7 @@
%{l_shtool} install -c -s -m 755 \
expect $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
- expect.man $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ expect.man $RPM_BUILD_ROOT%{l_prefix}/man/man1/expect.1
) || exit $?
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
