Wed Mar 10 09:25:00 UTC 2010

Author: vcrhonek

Update of /cvs/pkgs/rpms/expect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19366

Modified Files:
	.cvsignore expect-5.32.2-random.patch 
	expect-5.43.0-log_file.patch expect-5.43.0-pkgpath.patch 
	expect.spec sources 
Added Files:
	expect-5.44.1.15-tk-init.patch 
	expect-5.44.1.15-unbuffer-exit-code.patch 
Removed Files:
	expect-5.38.0-lib-spec.patch expect-5.38.0-spawn-43310.patch 
	expect-5.43.0-h-comments.patch expect-5.43.0-pkgIndex-x.patch 
	expect-5.43.0-tcl8.5.6.patch expect-5.43.0-tcl8.5.patch 
	unbuffer-child-flush-143963.patch 
Log Message:
Update to 5.44.1.15 from upstream CVS, Fix unbuffer to return exit code of ubuffered program, Fix Tk initialization

expect-5.44.1.15-tk-init.patch:
 exp_main_tk.c |  170 +++++++++++++++-------------------------------------------
 1 file changed, 46 insertions(+), 124 deletions(-)

--- NEW FILE expect-5.44.1.15-tk-init.patch ---
Author: Sergei Golovan <sgolovan at debian.org>
Description: Fixes Tk intialization by calling Tk_Init instead of
	     using copy&pasted Tk_Init from older Tk.

--- expect-5.44.1.14.orig/exp_main_tk.c
+++ expect-5.44.1.14/exp_main_tk.c
@@ -162,13 +162,7 @@
  * the "argv" variable in Tk_Init.
  */
 
-static int synchronize;
-static CONST char *name;
-static char *display;
-static char *geometry;
-static char *colormap;
-static char *visual;
-static int rest = 0;
+static int rest;
 
 /* for Expect */
 int my_rc = 1;
@@ -181,21 +175,6 @@
 int print_version = 0;
 
 static Tk_ArgvInfo argTable[] = {
-    {"-colormap", TK_ARGV_STRING, (char *) NULL, (char *) &colormap,
-	"Colormap for main window"},
-    {"-display", TK_ARGV_STRING, (char *) NULL, (char *) &display,
-	"Display to use"},
-    {"-geometry", TK_ARGV_STRING, (char *) NULL, (char *) &geometry,
-	"Initial geometry for window"},
-    {"-name", TK_ARGV_STRING, (char *) NULL, (char *) &name,
-	"Name to use for application"},
-    {"-sync", TK_ARGV_CONSTANT, (char *) 1, (char *) &synchronize,
-	"Use synchronous mode for display server"},
-    {"-visual", TK_ARGV_STRING, (char *) NULL, (char *) &visual,
-	"Visual for main window"},
-    {"--", TK_ARGV_REST, (char *) 1, (char *) &rest,
-	"Pass all remaining arguments through to script"},
-/* for Expect */
     {"-command", TK_ARGV_GENFUNC, (char *) optcmd_eval, (char *)0,
 	"Command(s) to execute immediately"},
     {"-diag", TK_ARGV_CONSTANT, (char *) optcmd_diagToStderr, (char *)0,
@@ -210,6 +189,8 @@
     {"-Debug", TK_ARGV_GENFUNC, (char *) optcmd_debug, (char *)0, 
 	"Enable debugger"},
 #endif
+    {"--", TK_ARGV_REST, (char *) 1, (char *) &rest,
+	"Pass all remaining arguments through to script"},
     {(char *) NULL, TK_ARGV_END, (char *) NULL, (char *) NULL,
 	(char *) NULL}
 };
@@ -243,11 +224,11 @@
     Tcl_Interp *interp;		/* Interpreter to initialize. */
 {
     CONST char *p;
-    char* alist, *cstr;
-    int argc, code;
-    char **argv, *args[20];
-    Tcl_DString class;
+    char *alist, *pp;
+    int argc, length, i, j;
+    char **argv, **newargv;
     char buffer[30];
+    size_t len;
 
     /*
      * If there is an "argv" variable, get its value, extract out
@@ -255,8 +236,7 @@
      * the arguments that we used.
      */
 
-    synchronize = 0;
-    name = display = geometry = colormap = visual = NULL; 
+    rest = -1;
     p = Tcl_GetVar2(interp, "argv", (char *) NULL, TCL_GLOBAL_ONLY);
     argv = NULL;
     if (p != NULL) {
@@ -285,115 +265,57 @@
 	    }
 	}
 
-	alist = Tcl_Merge(argc, argv);
-	Tcl_SetVar2(interp, "argv", (char *) NULL, alist, TCL_GLOBAL_ONLY);
-	sprintf(buffer, "%d", argc);
-	Tcl_SetVar2(interp, "argc", (char *) NULL, buffer, TCL_GLOBAL_ONLY);
-	ckfree(alist);
-    }
-
-    /*
-     * Figure out the application's name and class.
-     */
+	if (rest >= 0) {
+	    /* Resore '--' in arguments list
+	     */
 
-    if (name == NULL) {
-	name = Tcl_GetVar(interp, "argv0", TCL_GLOBAL_ONLY);
-	if ((name == NULL) || (*name == 0)) {
-	    name = "tk";
-	} else {
-	    p = (char *)strrchr(name, '/');     /* added cast - DEL */
-	    if (p != NULL) {
-		name = p+1;
+	    length = 0;
+	    for (i = 0; i < argc; i++) {
+		length += strlen(argv[i]) + 1;
 	    }
-	}
-    }
-    Tcl_DStringInit(&class);
-    Tcl_DStringAppend(&class, name, -1);
-    cstr = Tcl_DStringValue(&class);
-    if (islower(*cstr)) {
-	*cstr = toupper((unsigned char) *cstr);
-    }
 
-    /*
-     * Create an argument list for creating the top-level window,
-     * using the information parsed from argv, if any.
-     */
+	    newargv = (char **) ckalloc((unsigned) ((argc+2)*sizeof(char *)) + length + 3);
 
-    args[0] = "toplevel";
-    args[1] = ".";
-    args[2] = "-class";
-    args[3] = Tcl_DStringValue(&class);
-    argc = 4;
-    if (display != NULL) {
-	args[argc] = "-screen";
-	args[argc+1] = display;
-	argc += 2;
-
-	/*
-	 * If this is the first application for this process, save
-	 * the display name in the DISPLAY environment variable so
-	 * that it will be available to subprocesses created by us.
-	 */
+	    pp = ((char *) newargv) + (argc+2)*sizeof(char *);
+	    j = 0;
+	    for (i = 0; i < argc; i++) {
+		if (i == rest) {
+		    memcpy(pp, "--", 3);
+		    newargv[j++] = pp;
+		    pp += 3;
+		}
+
+		len = strlen(argv[i]) + 1;
+		memcpy(pp, argv[i], len);
+		newargv[j++] = pp;
+		pp += len;
+	    }
+	    newargv[j] = NULL;
 
-	if (numMainWindows == 0) {
-	    Tcl_SetVar2(interp, "env", "DISPLAY", display, TCL_GLOBAL_ONLY);
+	    alist = Tcl_Merge(argc+1, newargv);
+	} else {
+	    newargv = NULL;
+	    alist = Tcl_Merge(argc, argv);
 	}
-    }
-    if (colormap != NULL) {
-	args[argc] = "-colormap";
-	args[argc+1] = colormap;
-	argc += 2;
-    }
-    if (visual != NULL) {
-	args[argc] = "-visual";
-	args[argc+1] = visual;
-	argc += 2;
-    }
-    args[argc] = NULL;
-    code = TkCreateFrame((ClientData) NULL, interp, argc, args, 1, name);
-    Tcl_DStringFree(&class);
-    if (code != TCL_OK) {
-	goto done;
-    }
-    Tcl_ResetResult(interp);
-#ifndef MAC_OSX_TK
-    if (synchronize) {
-	XSynchronize(Tk_Display(Tk_MainWindow(interp)), True);
-    }
-#endif
 
-    /*
-     * Set the geometry of the main window, if requested.  Put the
-     * requested geometry into the "geometry" variable.
-     */
-
-    if (geometry != NULL) {
-	Tcl_SetVar(interp, "geometry", geometry, TCL_GLOBAL_ONLY);
-	code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
-	if (code != TCL_OK) {
-	    goto done;
-	}
-    }
-    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) {
-	code = TCL_ERROR;
-	goto done;
-    }
-    code = Tcl_PkgProvide(interp, "Tk", TK_VERSION);
-    if (code != TCL_OK) {
-	goto done;
+	Tcl_SetVar2(interp, "argv", (char *) NULL, alist, TCL_GLOBAL_ONLY);
+	sprintf(buffer, "%d", argc);
+	Tcl_SetVar2(interp, "argc", (char *) NULL, buffer, TCL_GLOBAL_ONLY);
+	ckfree(alist);
     }
 
-    /*
-     * Invoke platform-specific initialization.
-     */
-
-    code = TkpInit(interp, 0);
+    if (Tk_Init(interp) == TCL_ERROR) {
+	return TCL_ERROR;
+    }
 
-    done:
     if (argv != NULL) {
 	ckfree((char *) argv);
     }
-    return code;
+    if (newargv != NULL) {
+	ckfree((char *) newargv);
+    }
+
+    return TCL_OK;
 }
 
 /*ARGSUSED*/

expect-5.44.1.15-unbuffer-exit-code.patch:
 unbuffer |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE expect-5.44.1.15-unbuffer-exit-code.patch ---
diff -up expect-5.44.1.15/example/unbuffer.orig expect-5.44.1.15/example/unbuffer
--- expect-5.44.1.15/example/unbuffer.orig	2010-03-08 16:24:38.260378258 +0100
+++ expect-5.44.1.15/example/unbuffer	2010-03-08 16:24:57.525387178 +0100
@@ -19,4 +19,5 @@ if {[string compare [lindex $argv 0] "-p
     set timeout -1
     eval [list spawn -noecho] $argv
     expect
+    exit [lindex [eval wait] 3]
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Aug 2009 17:47:44 -0000	1.6
+++ .cvsignore	10 Mar 2010 09:24:58 -0000	1.7
@@ -1,2 +1 @@
-config.sub
-expect-5.43.0.tar.bz2
+expect-5.44.1.15.tar.bz2

expect-5.32.2-random.patch:
 mkpasswd |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: expect-5.32.2-random.patch
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/expect-5.32.2-random.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- expect-5.32.2-random.patch	25 Sep 2008 10:45:08 -0000	1.2
+++ expect-5.32.2-random.patch	10 Mar 2010 09:24:58 -0000	1.3
@@ -1,12 +1,12 @@
-diff -up expect-5.43/example/mkpasswd.random expect-5.43/example/mkpasswd
---- expect-5.43/example/mkpasswd.random	2004-12-07 00:38:21.000000000 +0100
-+++ expect-5.43/example/mkpasswd	2008-09-25 12:27:19.000000000 +0200
+diff -up expect-5.44.1.15/example/mkpasswd.orig expect-5.44.1.15/example/mkpasswd
+--- expect-5.44.1.15/example/mkpasswd.orig	2010-03-08 16:01:05.518378075 +0100
++++ expect-5.44.1.15/example/mkpasswd	2010-03-08 16:01:27.408388162 +0100
 @@ -92,7 +92,14 @@ proc insert {pvar char} {
  }
  
  proc rand {m} {
 -    expr {int($m*rand())}
-+    set device /dev/urandom		;# /dev/random can block
++    set device /dev/urandom            ;# /dev/random can block
 +    set fileId [open $device r]
 +    binary scan [read $fileId 4] i1 number
 +    set clipped [expr $number % $m]

expect-5.43.0-log_file.patch:
 exp_log.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: expect-5.43.0-log_file.patch
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/expect-5.43.0-log_file.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- expect-5.43.0-log_file.patch	25 Sep 2008 10:45:09 -0000	1.2
+++ expect-5.43.0-log_file.patch	10 Mar 2010 09:24:59 -0000	1.3
@@ -1,12 +1,12 @@
-diff -up expect-5.43/exp_log.c.log_file expect-5.43/exp_log.c
---- expect-5.43/exp_log.c.log_file	2004-08-18 22:54:35.000000000 +0200
-+++ expect-5.43/exp_log.c	2008-09-25 12:24:42.000000000 +0200
-@@ -471,7 +471,7 @@ expLogChannelOpen(interp,filename,append
- 	Tcl_DStringAppend(&tsdPtr->logFilename,filename,-1);
+diff -up expect-5.44.1.15/exp_log.c.orig expect-5.44.1.15/exp_log.c
+--- expect-5.44.1.15/exp_log.c.orig	2010-03-08 15:45:20.581378309 +0100
++++ expect-5.44.1.15/exp_log.c	2010-03-08 15:45:38.838398279 +0100
+@@ -374,7 +374,7 @@ expDiagChannelOpen(interp,filename)
+ 	Tcl_DStringAppend(&tsdPtr->diagFilename,filename,-1);
      }
  
--    tsdPtr->logChannel = Tcl_OpenFileChannel(interp,newfilename,mode,0777);
-+    tsdPtr->logChannel = Tcl_OpenFileChannel(interp,newfilename,mode,0666);
-     if (!tsdPtr->logChannel) {
- 	Tcl_DStringFree(&tsdPtr->logFilename);
+-    tsdPtr->diagChannel = Tcl_OpenFileChannel(interp,newfilename,"a",0777);
++    tsdPtr->diagChannel = Tcl_OpenFileChannel(interp,newfilename,"a",0666);
+     if (!tsdPtr->diagChannel) {
+ 	Tcl_DStringFree(&tsdPtr->diagFilename);
  	return TCL_ERROR;

expect-5.43.0-pkgpath.patch:
 Makefile.in  |   11 ++++++++---
 configure.in |    1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

Index: expect-5.43.0-pkgpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/expect-5.43.0-pkgpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- expect-5.43.0-pkgpath.patch	25 Sep 2008 10:45:09 -0000	1.2
+++ expect-5.43.0-pkgpath.patch	10 Mar 2010 09:24:59 -0000	1.3
@@ -1,34 +1,46 @@
-diff -up expect-5.43/configure.in.pkgpath expect-5.43/configure.in
---- expect-5.43/configure.in.pkgpath	2008-09-25 12:28:28.000000000 +0200
-+++ expect-5.43/configure.in	2008-09-25 12:28:28.000000000 +0200
-@@ -1260,6 +1260,7 @@ AC_SUBST(SETUID)
- AC_SUBST(UNSHARED_RANLIB)
+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)
+ AC_SUBST(SETUID)
+ AC_SUBST(SETPGRP_VOID)
  AC_SUBST(DEFAULT_STTY_ARGS)
- AC_SUBST(STTY_BIN)
 +AC_SUBST(TCL_VERSION)
- AC_OUTPUT([Makefile \
- 	pkgIndex],
- 	chmod +x ${srcdir}/install-sh ${srcdir}/mkinstalldirs)
-diff -up expect-5.43/Makefile.in.pkgpath expect-5.43/Makefile.in
---- expect-5.43/Makefile.in.pkgpath	2008-09-25 12:28:28.000000000 +0200
-+++ expect-5.43/Makefile.in	2008-09-25 12:28:28.000000000 +0200
-@@ -173,8 +173,8 @@ STTY = -DDFLT_STTY="\"@DEFAULT_STTY_ARGS
- bindir            = $(INSTALL_ROOT)@bindir@
- bindir_arch_indep = $(INSTALL_ROOT)$(prefix)/bin
- tcl_libdir        = $(INSTALL_ROOT)@libdir@
--libdir            = $(INSTALL_ROOT)@libdir@/expect$(VERSION)
--libdir_arch_indep = $(INSTALL_ROOT)$(prefix)/lib/expect$(VERSION)
-+libdir            = $(INSTALL_ROOT)@libdir@/tcl at TCL_VERSION@/expect$(VERSION)
-+libdir_arch_indep = $(INSTALL_ROOT)@datadir@/tcl at TCL_VERSION@/expect$(VERSION)
- 
- mandir 	= $(INSTALL_ROOT)@mandir@
- man1dir = $(mandir)/man1
-diff -up expect-5.43/pkgIndex.in.pkgpath expect-5.43/pkgIndex.in
---- expect-5.43/pkgIndex.in.pkgpath	2002-02-12 03:00:56.000000000 +0100
-+++ expect-5.43/pkgIndex.in	2008-09-25 12:28:28.000000000 +0200
-@@ -7,4 +7,4 @@
- # script is sourced, the variable $dir must contain the
- # full path name of this file's directory.
  
--package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
-+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. .. @EXP_SHARED_LIB_FILE@]]
+ #--------------------------------------------------------------------
+ #--------------------------------------------------------------------
+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
+@@ -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)
+ pkgincludedir	= $(includedir)/$(PKG_DIR)
+ 
+ top_builddir	= .
+@@ -267,7 +267,7 @@ install-doc: doc
+ 	  else true; fi ; \
+ 	done
+ 
+-test: binaries libraries
++test: binaries libraries pkgIndex.tcl-test
+ 	$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
+ 
+ shell: binaries libraries
+@@ -331,6 +331,11 @@ pkgIndex.tcl:
+ 
+ pkgIndex.tcl-hand:
+ 	(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
++	    [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\
++	) > pkgIndex.tcl
++
++pkgIndex.tcl-test:
++	(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
+ 	    [list load [file join $$dir $(PKG_LIB_FILE)]]'\
+ 	) > pkgIndex.tcl
+ 


Index: expect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/expect.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- expect.spec	10 Aug 2009 17:47:44 -0000	1.31
+++ expect.spec	10 Mar 2010 09:25:00 -0000	1.32
@@ -1,31 +1,31 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
-%define majorver 5.43
+%define majorver 5.44
 
 Summary: A program-script interaction and testing utility
 Name: expect
-Version: %{majorver}.0
-Release: 19%{?dist}
+Version: %{majorver}.1.15
+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: http://expect.nist.gov/src/%{name}-%{version}.tar.bz2
-Source1: config.sub
+# Source: upstream doesn't release tarballs, CVS snapshot packed
+Source: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires: tcl-devel tk-devel autoconf automake libXft-devel
-Patch0: expect-5.38.0-spawn-43310.patch
-Patch1: expect-5.43.0-h-comments.patch
-Patch2: expect-5.38.0-lib-spec.patch
-Patch3: expect-5.39.0-libdir.patch
-Patch4: expect-5.43.0-log_file.patch
-Patch5: expect-5.43.0-tcl8.5.patch
-Patch6: expect-5.43.0-pkgIndex-x.patch
-Patch7: expect-5.43.0-tcl8.5.6.patch
+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: unbuffer-child-flush-143963.patch
-# Fix install location for tcl 8.5
-Patch200: expect-5.43.0-pkgpath.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
@@ -62,27 +62,20 @@ control another program and interact wit
 This package contains expectk and some scripts that use it.
 
 %prep
-%setup -q -n expect-%{majorver}
-%patch0 -p1 -b .spawn
-%patch1 -p1 -b .h-comments
-%patch2 -p1 -b .lib-spec
-%patch3 -p1 -b .libdir
-%patch4 -p1 -b .log_file
-%patch5 -p1 -b .tcl8.5
-%patch6 -p1 -b .pkgIndex-x
-#%patch7 -p1 -b .tcl8.5.6
+%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
-%patch200 -p1 -b .pkgpath
-# *-lib-spec.patch and *-tcl8.5.patch and -pkgpath.patch touch configure.in
+%patch101 -p1 -b .unbuffer-exit-code
+# -pkgpath.patch touch configure.in
 aclocal
 autoconf
 ( cd testsuite
   autoconf -I.. )
 
 %build
-cp -fp %SOURCE1 .;
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared \
 	--with-tclinclude=%{_includedir}/tcl-private
 make %{?_smp_mflags}
@@ -92,7 +85,10 @@ make test
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
-make install INSTALL_ROOT="$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}
 
 # for linking with -lexpect
 ln -s libexpect%{majorver}.so "$RPM_BUILD_ROOT"%{_libdir}/libexpect.so
@@ -102,6 +98,9 @@ rm -f "$RPM_BUILD_ROOT"%{_bindir}/{crypt
 rm -f "$RPM_BUILD_ROOT"%{_mandir}/man1/{cryptdir,decryptdir}.1*
 rm -f "$RPM_BUILD_ROOT"%{_bindir}/autopasswd
 
+# remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
+
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
@@ -124,9 +123,9 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_bindir}/unbuffer
 %{_bindir}/weather
 %{_bindir}/xkibitz
-%dir %{tcl_sitearch}/expect%{majorver}
-%{tcl_sitearch}/expect%{majorver}/pkgIndex.tcl
-%{_libdir}/libexpect%{majorver}.so
+%dir %{tcl_sitearch}/expect%{version}
+%{tcl_sitearch}/expect%{version}/pkgIndex.tcl
+%{_libdir}/libexpect%{version}.so
 %{_mandir}/man1/autoexpect.1.gz
 %{_mandir}/man1/dislocate.1.gz
 %{_mandir}/man1/expect.1.gz
@@ -139,8 +138,6 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files devel
 %defattr(-,root,root,-)
-%exclude %{tcl_sitearch}/expect%{majorver}/libexpect%{majorver}.a
-%exclude %{_libdir}/libexpect%{majorver}.a
 %{_libdir}/libexpect.so
 %{_mandir}/man3/libexpect.3*
 %{_includedir}/*
@@ -157,6 +154,16 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* 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
+- Remove config.sub (no longer needed), remove unused patches (few are
+  upstream now, few are pointless with new version), comment patches
+- Fix unbuffer to return exit code of ubuffered program
+  Resolves: #547686
+- Fix Tk initialization
+  Resolves: #456738
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 5.43.0-19
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expect/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	10 Aug 2009 17:47:44 -0000	1.8
+++ sources	10 Mar 2010 09:25:00 -0000	1.9
@@ -1,2 +1,2 @@
+7b4ffbcfcbe779a6b8e1f2931f0aeff7  expect-5.44.1.15.tar.bz2
 d2ef2acafb72e8f3f3029d30e2a8e228  config.sub
-e6aaab98967f6410099b40f2b3ddebb4  expect-5.43.0.tar.bz2


--- expect-5.38.0-lib-spec.patch DELETED ---


--- expect-5.38.0-spawn-43310.patch DELETED ---


--- expect-5.43.0-h-comments.patch DELETED ---


--- expect-5.43.0-pkgIndex-x.patch DELETED ---


--- expect-5.43.0-tcl8.5.6.patch DELETED ---


--- expect-5.43.0-tcl8.5.patch DELETED ---


--- unbuffer-child-flush-143963.patch DELETED ---

