rpms/tcl/devel tcl-8.4.12-relid.patch,NONE,1.1 tcl.spec,1.15,1.16

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/tcl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14690

Modified Files:
	tcl.spec 
Added Files:
	tcl-8.4.12-relid.patch 
Log Message:
Patched syntax errors in configure and tcl.m4 so it works with bash


tcl-8.4.12-relid.patch:
 configure |    2 +-
 tcl.m4    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tcl-8.4.12-relid.patch ---
--- tcl8.4.12/unix/tcl.m4.relid	2005-12-06 11:03:34.000000000 -0500
+++ tcl8.4.12/unix/tcl.m4	2006-02-02 13:41:02.000000000 -0500
@@ -879,7 +879,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -2317,7 +2317,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
--- tcl8.4.12/unix/configure.relid	2005-12-06 11:03:33.000000000 -0500
+++ tcl8.4.12/unix/configure	2006-02-02 13:38:47.000000000 -0500
@@ -2481,7 +2481,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tcl.spec	2 Feb 2006 18:29:21 -0000	1.15
+++ tcl.spec	2 Feb 2006 18:42:35 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.12
-Release: 2
+Release: 3
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -11,14 +11,12 @@
 Source1: http://download.sourceforge.net/tcl/tk%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Buildrequires: autoconf, sed
-%ifnarch ia64
-Buildrequires: ksh
-%endif
 Patch1: tcl-8.3.5-tclm4-soname.patch
 Patch2: tcl-8.4.5-lib-perm.patch
 Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
 Patch4: tcl-8.4-no_rpath.patch
 Patch5: tcl-8.4-autoconf.patch
+Patch6: tcl-8.4.12-relid.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -69,18 +67,12 @@
 %patch3 -p1 -b .3-pkgpath
 %patch4 -p1 -b .4-rpath
 %patch5 -p1 -b .5-ac213
+%patch6 -p1 -b .6-relid
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
 cd unix
 autoconf
 
-%ifnarch ia64
-# use ksh instead of bash (upstream knows bash-3.1 breaks, they are working
-# on a fix for 8.4.13 or a later release)
-sed -i -e 's,#! /bin/sh,#! /bin/ksh,g' configure
-sed -i -e 's,#! /bin/bash -norc,#! /bin/ksh,g' configure.in
-%endif
-
 %build
 cd %{name}%{version}/unix
 %configure
@@ -158,6 +150,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-3
+- Patched syntax errors in configure and tcl.m4 so it works with bash
+
 * Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-2
 - Don't use ksh on ia64