- up to 5.45; add make test

Changed files:
    expect-fixcat.patch -> 1.2
    expect.spec -> 1.72

diff --git a/expect-fixcat.patch b/expect-fixcat.patch
deleted file mode 100644 (file)
index d558335..0000000
--- a/expect-fixcat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- expect5.31/fixcat.fixcat   Fri Jun  2 13:35:51 2000
-+++ expect5.31/fixcat  Fri Jun  2 13:36:56 2000
-@@ -8,11 +8,14 @@
- # If this file is sitting in an architecture-specific library directory,
- # then it serves as a marker that your /bin/cat buffers by default.
- 
-+# XXX Red Hat linux has unbuffered cat
-+exit 0
-+
- # test for when catting to/from files
--log_user 0
--spawn -open [open "|cat" "r+"]
--send "\r"
--expect "\r" {exit 1}
-+#log_user 0
-+#spawn -open [open "|cat" "r+"]
-+#send "\r"
-+#expect "\r" {exit 1}
- 
- # test for when catting to real tty
- #log_user 0

diff --git a/expect.spec b/expect.spec
index 315640b4671a867769c8b578f407fefb8d9b34d9..eedf15360104db77f809c724056ec3087d2733a7 100644 (file)
--- a/expect.spec
+++ b/expect.spec
@@ -2,6 +2,7 @@
 # BIG FAT WARNING:
 #      - expect requires mounted /dev/pts to avoid `spawn failed' errors.
 #
+%bcond_witout  tests
 Summary:       Tcl expect extension
 Summary(de.UTF-8):     Tcl-Erweiterung
 Summary(fr.UTF-8):     Extension Tcl
@@ -10,16 +11,15 @@ Summary(ru.UTF-8):  Расширение Tcl для управления прог
 Summary(tr.UTF-8):     Programlar arası etkileşimi mümkün kılan Tcl genişletmesi
 Summary(uk.UTF-8):     Розширення Tcl для керування програмами зі скриптів
 Name:          expect
-Version:       5.44.1.15
+Version:       5.45
 Release:       1
 License:       BSD
 Group:         Development/Languages/Tcl
-Source0:       http://downloads.sourceforge.net/expect/%{name}-%{version}.tar.bz2
-# Source0-md5: 9307bbf67e19125036ce34544a78dadf
+Source0:       http://downloads.sourceforge.net/project/expect/Expect/%{version}/%{name}%{version}.tar.gz
+# Source0-md5: 44e1a4f4c877e9ddc5a542dfa7ecc92b
 Patch0:                %{name}-pty.patch
 Patch1:                %{name}-bug7869.patch
-Patch2:                %{name}-fixcat.patch
-Patch3:                %{name}-soname.patch
+Patch2:                %{name}-soname.patch
 URL:           http://expect.nist.gov/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -100,11 +100,10 @@ documentation.
 Pliki nagłówkowe i dokumentacja do rozszerzenia expect języka Tcl.
 
 %prep
-%setup -q
+%setup -q -n %{name}%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 chmod +w {.,testsuite}/configure
 
@@ -117,15 +116,20 @@ cd testsuite
 cd ..
 CFLAGS="%{rpmcflags} -I%{_includedir}/tcl-private/unix"
 %configure \
+%if "%{_lib}" == "lib64"
+       --enable-64bit \
+%endif
        --enable-gcc \
        --enable-shared \
        --with-tclconfig=%{_ulibdir} \
        --with-tkconfig=%{_ulibdir} \
-       --with-tclinclude=%{_includedir}/tcl-private \
+       --with-tclinclude=%{_includedir} \
        --with-tkinclude=%{_includedir}
 
 %{__make}
 
+%{?with_tests:%{__make} test TCLSH_PROG=tclsh}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -182,13 +186,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files X11
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/expectk
 %attr(755,root,root) %{_bindir}/multixterm
 %attr(755,root,root) %{_bindir}/tknewsbiff
 %attr(755,root,root) %{_bindir}/tkpasswd
 %attr(755,root,root) %{_bindir}/xkibitz
 %attr(755,root,root) %{_bindir}/xpstat
-%{_mandir}/man1/expectk.1*
 %{_mandir}/man1/multixterm.1*
 %{_mandir}/man1/tknewsbiff.1*
 %{_mandir}/man1/xkibitz.1*