diff --git a/expect.spec b/expect.spec index 60dcb5c..1ff01e4 100644 --- a/expect.spec +++ b/expect.spec @@ -1,16 +1,17 @@ +%global _unpackaged_files_terminate_build 0 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}} -%global majorver 5.45 +%global majorver 5.44.1.14 Summary: A program-script interaction and testing utility Name: expect Version: %{majorver} -Release: 7%{?dist} +Release: 0google%{?dist} License: Public Domain Group: Development/Languages # URL: probably more useful is http://sourceforge.net/projects/expect/ URL: http://expect.nist.gov/ -Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz +Source: expect_5.44.1.14.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: tcl-devel tk-devel autoconf automake libXft-devel chrpath # Patch0: fixes change log file permissions @@ -71,24 +72,25 @@ Please use tclsh with package require Tk and Expect instead of expectk. %prep -%setup -q -n expect%{version} -%patch0 -p1 -b .log_file -%patch1 -p1 -b .pkgpath -%patch2 -p1 -b .man-page -%patch3 -p1 -b .match-gt-numchars-segfault +%setup -q +#-n expect%{version} +#patch0 -p1 -b .log_file +#patch1 -p1 -b .pkgpath +#patch2 -p1 -b .man-page +#patch3 -p1 -b .match-gt-numchars-segfault # examples fixes -%patch100 -p1 -b .random -%patch101 -p1 -b .mkpasswd-dash -%patch102 -p1 -b .check-telnet -%patch103 -p1 -b .passmass-su-full-path +#patch100 -p1 -b .random +#patch101 -p1 -b .mkpasswd-dash +#patch102 -p1 -b .check-telnet +#patch103 -p1 -b .passmass-su-full-path # -pkgpath.patch touch configure.in -aclocal -autoconf -( cd testsuite - autoconf -I.. ) +#aclocal +#autoconf +#( cd testsuite +# autoconf -I.. ) %build -%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared \ +%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --enable-shared \ --with-tclinclude=%{_includedir}/tcl-private/generic make %{?_smp_mflags} @@ -100,7 +102,10 @@ rm -rf "$RPM_BUILD_ROOT" make install DESTDIR="$RPM_BUILD_ROOT" # move -mv "$RPM_BUILD_ROOT"%{tcl_sitearch}/expect%{version}/libexpect%{version}.so "$RPM_BUILD_ROOT"%{_libdir} +mv "$RPM_BUILD_ROOT"%{_libdir}/expect%{version}/libexpect%{version}.so "$RPM_BUILD_ROOT"%{_libdir} +mkdir "$RPM_BUILD_ROOT"%{tcl_sitearch} +mkdir "$RPM_BUILD_ROOT"%{tcl_sitearch}/expect%{version} +mv "$RPM_BUILD_ROOT"%{_libdir}/expect%{version}/pkgIndex.tcl "$RPM_BUILD_ROOT"%{tcl_sitearch}/expect%{version}/ # for linking with -lexpect ln -s libexpect%{majorver}.so "$RPM_BUILD_ROOT"%{_libdir}/libexpect.so