From 5f8aefc21d554548f89f9d3231c3e2a0fb9c2e51 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 2 Feb 2006 18:42:35 +0000 Subject: [PATCH] Patched syntax errors in configure and tcl.m4 so it works with bash --- tcl.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tcl.spec b/tcl.spec index 05427c6..cdfc85f 100644 --- a/tcl.spec +++ b/tcl.spec @@ -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 @@ Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz 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 @@ cd %{name}%{version} %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 @@ rm -rf $RPM_BUILD_ROOT %doc %{name}%{version}/html/* %changelog +* Thu Feb 02 2006 David Cantrell - 8.4.12-3 +- Patched syntax errors in configure and tcl.m4 so it works with bash + * Thu Feb 02 2006 David Cantrell - 8.4.12-2 - Don't use ksh on ia64