diff --git a/expect/expect.spec b/expect/expect.spec index 609b1a69c0..8bb398c6cf 100644 --- a/expect/expect.spec +++ b/expect/expect.spec @@ -23,9 +23,18 @@ ## SUCH DAMAGE. ## -%define V_expect_maj 5.34 -%define V_expect_min 5.34.1 -%define V_tcl 8.3.4 +# 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 5.37 +%define V_tcl 8.3.4 # package information Name: expect @@ -36,8 +45,8 @@ Packager: The OpenPKG Project Distribution: OpenPKG [EXP] Group: Language License: GPL -Version: %{V_expect_min} -Release: 20020318 +Version: %{V_expect} +Release: 20020613 # list of sources Source0: http://expect.nist.gov/expect.tar.gz @@ -46,8 +55,8 @@ Source1: ftp://ftp.scriptics.com/pub/tcl/tcl8_3/tcl%{V_tcl}.tar.gz # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206 -PreReq: OpenPKG, openpkg >= 20020206 +BuildPreReq: OpenPKG, openpkg >= 20020206, tcl = %{V_tcl} +PreReq: OpenPKG, openpkg >= 20020206, tcl = %{V_tcl} AutoReq: no AutoReqProv: no @@ -58,7 +67,7 @@ AutoReqProv: no applications. %prep - %setup0 -q -c -n expect-%{V_expect_maj} + %setup0 -q -c -n expect-%{version} %setup1 -q -T -D -a 1 %build @@ -72,7 +81,7 @@ AutoReqProv: no --disable-shared %{l_make} %{l_mflags -O} ) - ( cd expect-%{V_expect_maj} + ( cd expect-%{V_expect} CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ ./configure \ @@ -86,7 +95,7 @@ AutoReqProv: no %install rm -rf $RPM_BUILD_ROOT - ( cd expect-%{V_expect_maj} + ( cd expect-%{V_expect} %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin \ $RPM_BUILD_ROOT%{l_prefix}/man/man1