[expect] Update to expect-5.45

vcrhonek vcrhonek at fedoraproject.org
Tue Jan 18 18:09:41 UTC 2011


commit 0c6b037f35b5accf498abf2d61a5c4df64324e71
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Tue Jan 18 19:09:30 2011 +0100

    Update to expect-5.45

 .gitignore                                |    1 +
 expect-5.39.0-libdir.patch                |   12 --
 expect-5.43.0-pkgpath.patch               |   30 ++--
 expect-5.44.1.15-tk-init.patch            |  232 -----------------------------
 expect-5.44.1.15-unbuffer-exit-code.patch |    9 -
 expect.spec                               |   28 ++--
 sources                                   |    3 +-
 7 files changed, 30 insertions(+), 285 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c68106..4b44178 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 expect-5.44.1.15.tar.bz2
+/expect5.45.tar.gz
diff --git a/expect-5.43.0-pkgpath.patch b/expect-5.43.0-pkgpath.patch
index 71872d8..0c32a1f 100644
--- a/expect-5.43.0-pkgpath.patch
+++ b/expect-5.43.0-pkgpath.patch
@@ -1,29 +1,29 @@
-diff -up expect-5.44.1.15/configure.in.pkgpath expect-5.44.1.15/configure.in
---- expect-5.44.1.15/configure.in.pkgpath	2009-11-03 20:27:58.000000000 +0100
-+++ expect-5.44.1.15/configure.in	2010-03-09 14:46:47.997377875 +0100
-@@ -1198,6 +1198,7 @@ AC_SUBST(EXP_SHLIB_LD_LIBS)
+diff -up expect5.45/configure.in.orig expect5.45/configure.in
+--- expect5.45/configure.in.orig	2011-01-18 16:58:14.860806442 +0100
++++ expect5.45/configure.in	2011-01-18 16:58:30.378753210 +0100
+@@ -977,6 +977,7 @@ AC_SUBST(EXP_CC_SEARCH_FLAGS)
  AC_SUBST(SETUID)
  AC_SUBST(SETPGRP_VOID)
  AC_SUBST(DEFAULT_STTY_ARGS)
 +AC_SUBST(TCL_VERSION)
- 
- #--------------------------------------------------------------------
- #--------------------------------------------------------------------
-diff -up expect-5.44.1.15/Makefile.in.pkgpath expect-5.44.1.15/Makefile.in
---- expect-5.44.1.15/Makefile.in.pkgpath	2008-10-03 19:05:14.000000000 +0200
-+++ expect-5.44.1.15/Makefile.in	2010-03-09 14:47:20.101376873 +0100
+ # Expect uses these from tclConfig.sh to make the main executable
+ AC_SUBST(TCL_DL_LIBS)
+ AC_SUBST(TCL_CC_SEARCH_FLAGS)
+diff -up expect5.45/Makefile.in.orig expect5.45/Makefile.in
+--- expect5.45/Makefile.in.orig	2011-01-18 16:58:37.787723824 +0100
++++ expect5.45/Makefile.in	2011-01-18 17:05:10.697636907 +0100
 @@ -121,8 +121,8 @@ includedir	= @includedir@
  DESTDIR		=
  
  PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
 -pkgdatadir	= $(datadir)/$(PKG_DIR)
 -pkglibdir	= $(libdir)/$(PKG_DIR)
-+pkgdatadir	= $(datadir)/tcl at TCL_VERSION@/$(PKG_DIR)
-+pkglibdir	= $(libdir)/tcl at TCL_VERSION@/$(PKG_DIR)
++pkgdatadir     = $(datadir)/tcl at TCL_VERSION@/$(PKG_DIR)
++pkglibdir      = $(libdir)/tcl at TCL_VERSION@/$(PKG_DIR)
  pkgincludedir	= $(includedir)/$(PKG_DIR)
  
  top_builddir	= .
-@@ -267,7 +267,7 @@ install-doc: doc
+@@ -263,7 +263,7 @@ install-doc: doc
  	  else true; fi ; \
  	done
  
@@ -33,9 +33,9 @@ diff -up expect-5.44.1.15/Makefile.in.pkgpath expect-5.44.1.15/Makefile.in
  
  shell: binaries libraries
 @@ -331,6 +331,11 @@ pkgIndex.tcl:
- 
  pkgIndex.tcl-hand:
- 	(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
+ 	(echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \
+ 	 echo 'package ifneeded Expect $(PACKAGE_VERSION) \
 +	    [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\
 +	) > pkgIndex.tcl
 +
diff --git a/expect.spec b/expect.spec
index e91fb22..6513ab8 100644
--- a/expect.spec
+++ b/expect.spec
@@ -1,31 +1,26 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
-%define majorver 5.44
+%define majorver 5.45
 
 Summary: A program-script interaction and testing utility
 Name: expect
-Version: %{majorver}.1.15
+Version: %{majorver}
 Release: 1%{?dist}
 License: Public Domain
 Group: Development/Languages
 # URL: probably more useful is http://sourceforge.net/projects/expect/
 URL: http://expect.nist.gov/
 # Source: upstream doesn't release tarballs, CVS snapshot packed
-Source: %{name}-%{version}.tar.bz2
+Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.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
 Patch0: expect-5.43.0-log_file.patch
 # Patch1: fixes install location, change pkgIndex
 Patch1: expect-5.43.0-pkgpath.patch
-# Patch2: fixes bz456738, expectk is unsupported by upstream actually,
-#	but the patch is under discussion (patch by Sergei Golovan)
-Patch2: expect-5.44.1.15-tk-init.patch
 # examples patches
 # Patch100: changes random function
 Patch100: expect-5.32.2-random.patch
-# Patch101: bz547686, no response from upstream
-Patch101: expect-5.44.1.15-unbuffer-exit-code.patch
 
 %description
 Expect is a tcl application for automating and testing
@@ -59,16 +54,18 @@ interactive applications such as telnet, ftp, passwd, fsck,
 rlogin, tip, etc. Expect makes it easy for a script to
 control another program and interact with it.
 
-This package contains expectk and some scripts that use it.
+This package originally contained expectk and some scripts
+that used it. As expectk was removed from upstream tarball
+in expect-5.45, now the package contains just these scripts.
+Please use tclsh with package require Tk and Expect instead
+of expectk.
 
 %prep
-%setup -q -n expect-%{version}
+%setup -q -n expect%{version}
 %patch0 -p1 -b .log_file
 %patch1 -p1 -b .pkgpath
-%patch2 -p1 -b .tk-init
 # examples fixes
 %patch100 -p1 -b .random
-%patch101 -p1 -b .unbuffer-exit-code
 # -pkgpath.patch touch configure.in
 aclocal
 autoconf
@@ -77,7 +74,7 @@ autoconf
 
 %build
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared \
-	--with-tclinclude=%{_includedir}/tcl-private
+	--with-tclinclude=%{_includedir}/tcl-private/generic
 make %{?_smp_mflags}
 
 %check
@@ -144,16 +141,17 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files -n expectk
 %defattr(-,root,root,-)
-%{_bindir}/expectk
 %{_bindir}/multixterm
 %{_bindir}/tknewsbiff
 %{_bindir}/tkpasswd
 %{_bindir}/xpstat
-%{_mandir}/man1/expectk.1*
 %{_mandir}/man1/multixterm.1*
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Tue Jan 18 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 5.45-1
+- Update to expect-5.45
+
 * Wed Mar 10 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 5.44.1.15-1
 - Update to 5.44.1.15 from upstream CVS
   Resolves: #528654, Resolves: #501820
diff --git a/sources b/sources
index 226af34..d74f1af 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7b4ffbcfcbe779a6b8e1f2931f0aeff7  expect-5.44.1.15.tar.bz2
-d2ef2acafb72e8f3f3029d30e2a8e228  config.sub
+44e1a4f4c877e9ddc5a542dfa7ecc92b  expect5.45.tar.gz


More information about the scm-commits mailing list