From e0713e285a1b9535aa2ad014f90fb0875bcf0df0397dd033b43db808b6d791e3 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 8 Apr 2008 22:57:15 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/x3270?expand=0&rev=4

---
 x3270.changes |   5 ++
 x3270.spec    | 124 +++++++++++++++++++++++++-------------------------
 2 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/x3270.changes b/x3270.changes
index 1955b92..a400062 100644
--- a/x3270.changes
+++ b/x3270.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  8 12:10:41 CEST 2008 - max@suse.de
+
+- Fixed build for Tcl 8.5.
+
 -------------------------------------------------------------------
 Thu Mar 29 22:36:08 CEST 2007 - ro@suse.de
 
diff --git a/x3270.spec b/x3270.spec
index cd064ad..1413748 100644
--- a/x3270.spec
+++ b/x3270.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package x3270 (Version 3.2.20)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           x3270
 %if %suse_version > 910
 BuildRequires:  ncurses-devel xorg-x11 xorg-x11-devel
@@ -34,11 +35,11 @@ BuildRequires:  XFree86 XFree86-devel
 BuildRequires:  freetype2 tcl-devel
 License:        X11/MIT
 Group:          System/X11/Terminals
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        3.2.20
-Release:        346
+Release:        454
 Summary:        A Family of IBM 3270 Terminal Emulators
-URL:            http://x3270.bgp.nu
+Url:            http://x3270.bgp.nu
 Source0:        http://x3270.bgp.nu/download/x3270-334p4.tgz
 Source1:        http://x3270.bgp.nu/download/s3270-334p3.tgz
 Source2:        http://x3270.bgp.nu/download/tcl3270-334p3.tgz
@@ -124,15 +125,12 @@ export LIBX3270DIR=/etc/x3270
 cd tcl3270-3.3
     %{?suse_update_config:%{suse_update_config -f .}}
     autoconf
-    TCL_VERSION=$(echo 'puts [package require Tcl]' | tclsh)
-    TCLX_VERSION=$(echo 'puts [package require Tclx]' | tclsh)
     ./configure \
 	--cache-file=../config.cache \
 	--bindir=%{_bindir} \
 	--prefix=%{_prefix} \
 	--mandir=%{_mandir} \
-	--with-tcl=$TCL_VERSION
-#	--with-tclx=$TCLX_VERSION
+	--with-tcl=%tcl_version
     make LIBX3270DIR=${LIBX3270DIR}
 cd ..
 # the X variant
@@ -297,141 +295,143 @@ chmod ugo-x $RPM_BUILD_ROOT/usr/share/man/man{1,5}/*
 %doc %attr(644,root,root) README.SuSE
 
 %changelog
-* Thu Mar 29 2007 - ro@suse.de
+* Tue Apr 08 2008 max@suse.de
+- Fixed build for Tcl 8.5.
+* Fri Mar 30 2007 ro@suse.de
 - added ncurses-devel to buildreq
-* Wed Mar 28 2007 - mfabian@suse.de
+* Wed Mar 28 2007 mfabian@suse.de
 - add run_suseconfig_fonts to %%post and %%postun
-* Fri Nov 10 2006 - ihno@suse.de
+* Fri Nov 10 2006 ihno@suse.de
 - fixing wrong permissions of man pages
-* Thu Aug 10 2006 - mfabian@suse.de
+* Thu Aug 10 2006 mfabian@suse.de
 - move fonts, binaries, man-pages to the new paths used by
   X11R7 (fixes build in STABLE).
 - use RPM_OPT_FLAGS
-* Thu Feb 16 2006 - ro@suse.de
+* Thu Feb 16 2006 ro@suse.de
 - fix directory permissions
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Mon Jun 20 2005 - yxu@suse.de
+* Mon Jun 20 2005 yxu@suse.de
 - fixed patch to apply
-* Thu Jun 16 2005 - yxu@suse.de
+* Thu Jun 16 2005 yxu@suse.de
 - update sources to version 3.3.4
-* Thu Apr 21 2005 - coolo@suse.de
+* Thu Apr 21 2005 coolo@suse.de
 - fix compilation
-* Tue May 11 2004 - hare@suse.de
+* Tue May 11 2004 hare@suse.de
 - Do not call mkfontsdir to avoid dependency problems (#40318).
-* Wed Apr 28 2004 - hare@suse.de
+* Wed Apr 28 2004 hare@suse.de
 - Fix memleak in pr3270 (#39528).
-* Fri Feb 27 2004 - hare@suse.de
+* Fri Feb 27 2004 hare@suse.de
 - Update to 3.3.2p1.
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
 - fix to build as user
-* Sun Nov 02 2003 - ro@suse.de
+* Mon Nov 03 2003 ro@suse.de
 - updated neededforbuild
-* Mon Aug 11 2003 - hare@suse.de
+* Mon Aug 11 2003 hare@suse.de
 - Fixed ppc64 build problems.
 - Fixed gcc-3.3 compilation warnings.
-* Fri Jul 18 2003 - hare@suse.de
+* Fri Jul 18 2003 hare@suse.de
 - Added freetype2 to prerequisites.
-* Thu Jun 12 2003 - kukuk@suse.de
+* Thu Jun 12 2003 kukuk@suse.de
 - Fix filelist
-* Fri Jun 06 2003 - mmj@suse.de
+* Fri Jun 06 2003 mmj@suse.de
 - Remove unwanted files from BuildRoot.
-* Mon Feb 24 2003 - froh@suse.de
+* Mon Feb 24 2003 froh@suse.de
 - updated to 3.2.20 bug fix only drop which incoroprates all
   the patches we had on top of 3.2.19
-* Wed Nov 27 2002 - sf@suse.de
+* Wed Nov 27 2002 sf@suse.de
 - added patch x3270-3.2.19.x86_64.diff to prevent segfaulting
   on x86_64
-* Thu Sep 26 2002 - ro@suse.de
+* Thu Sep 26 2002 ro@suse.de
 - removed bogus self-provides again (3rd time)
-* Thu Sep 26 2002 - froh@suse.de
+* Thu Sep 26 2002 froh@suse.de
 - during installation with YaST, mkfontdir will be called by yast
   automatically.  thus added test to %%-post* scripts to not
   run mkfontdir in case the package is installed from withing YaST.
   (#20127)
-* Mon Sep 23 2002 - froh@suse.de
+* Mon Sep 23 2002 froh@suse.de
 - drop use of chroot and relative paths in %%post/%%postun (#20011)
   and replace xf86 in PreReq by name of mkfontdir binary
 - fix date in README.SuSE
-* Tue Aug 20 2002 - ro@suse.de
+* Tue Aug 20 2002 ro@suse.de
 - built tcl3270 without tclx
-* Tue Aug 13 2002 - froh@suse.de
+* Tue Aug 13 2002 froh@suse.de
 - add pacthes for known bugs
   * R1: x3270 Not Recognizing crosshair Resource
   * R2: c3270 Goes Into Tight Loop on End-of-File
   * R3: Screen Resizing Broken (this one hit us)
   * R4: Keymap Saved as 'base'
-* Sun Jul 28 2002 - kukuk@suse.de
+* Sun Jul 28 2002 kukuk@suse.de
 - Add xf86 again
-* Sat Jul 27 2002 - adrian@suse.de
+* Sat Jul 27 2002 adrian@suse.de
 - fix neededforbuld and PreRequires
-* Fri Jul 12 2002 - max@suse.de
+* Fri Jul 12 2002 max@suse.de
 - Fixed tcl3270-3.2/configure.in for tcl8.4
-* Mon Jul 01 2002 - froh@suse.de
+* Mon Jul 01 2002 froh@suse.de
 - updated to current release 3.2.19
 - added the state of the art IBM 026 keypunch emulator :)
-* Tue Feb 19 2002 - froh@suse.de
+* Tue Feb 19 2002 froh@suse.de
 - added most recent bugfixes from x3270 site
 - switched to the new simpler all-in-one-tarball
-* Fri Jan 25 2002 - froh@suse.de
+* Fri Jan 25 2002 froh@suse.de
 - upgraded to current release 3.2.18 + current bugfixes
-* Sun Dec 09 2001 - ro@suse.de
+* Mon Dec 10 2001 ro@suse.de
 - there is no /usr/etc allowed in fhs 2.2
-* Tue Nov 20 2001 - froh@suse.de
+* Tue Nov 20 2001 froh@suse.de
 - added current patches from x3270 site:
   * fixed cut&paste if  selection is spanning several lines
   * keymap fix (C-u and C-w definitions had been hidden)
-* Wed Oct 31 2001 - bk@suse.de
+* Wed Oct 31 2001 bk@suse.de
 - use mode 644 for config file /usr/etc/x3270/ibm_hosts
-* Thu Oct 18 2001 - bk@suse.de
+* Thu Oct 18 2001 bk@suse.de
 - make ibm_hosts file noreplace(file format was not updated, old can be used)
-* Mon Jul 30 2001 - froh@suse.de
+* Mon Jul 30 2001 froh@suse.de
 - patched /usr/local/bin to /usr/bin in a new expect script below
   s3270/Examples/* and checked that no /usr/local are left :)
-* Wed Jul 25 2001 - froh@suse.de
+* Wed Jul 25 2001 froh@suse.de
 - patched away /usr/local/bin in a new shell script below
   x3270/Examples/*
-* Tue Jul 24 2001 - froh@suse.de
+* Tue Jul 24 2001 froh@suse.de
 - upgraded to current release 3.2.17 + current bugfixes
-* Wed Mar 28 2001 - froh@suse.de
+* Wed Mar 28 2001 froh@suse.de
 - use 'size_t' consistently instead of 'unsigned' to make pr3278 build
   on axp (use-size_t.diff)
-* Wed Mar 28 2001 - froh@suse.de
+* Wed Mar 28 2001 froh@suse.de
 - upgraded to current version 3.2.16
 - added c3270, tcl3270, s3270 and made them coexist with each other
   (common config file, shared helpers)
-* Thu Nov 30 2000 - fober@suse.de
+* Thu Nov 30 2000 fober@suse.de
 - upgraded to current version 3.2.14
 - adopted to current FHS
 - introduced BuildRoot to clean up %%files-section
-* Fri Oct 27 2000 - fober@suse.de
+* Fri Oct 27 2000 fober@suse.de
 - fixed calling of mkfontdir(needs chroot if no xshared in instsys) in
   %%postun as well
-* Mon Oct 09 2000 - bk@suse.de
+* Mon Oct 09 2000 bk@suse.de
 - fixed calling of mkfontdir(needs chroot if no xshared in instsys) in
   %%postin
-* Wed Jun 07 2000 - ro@suse.de
+* Wed Jun 07 2000 ro@suse.de
 - fixed path for mkfontdir
-* Tue Feb 01 2000 - mkraft@suse.de
+* Wed Feb 02 2000 mkraft@suse.de
 - updated to new (alpha) version 3.2, some changes to spec file
   - pre- and postinstall scripts to rebuild fonts.dir
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Wed Mar 17 1999 - ro@suse.de
+* Wed Mar 17 1999 ro@suse.de
 - remove .orig with -f
-* Sat Sep 19 1998 - ro@suse.de
+* Sat Sep 19 1998 ro@suse.de
 - dont redeclare sys_errlist for glibc
-* Thu Jul 23 1998 - werner@suse.de
+* Thu Jul 23 1998 werner@suse.de
 - Check exit status of mknod in peer_script.(ba)sh
-* Mon Nov 17 1997 - ro@suse.de
+* Mon Nov 17 1997 ro@suse.de
 - changes /usr/local/bin/expect to /usr/bin/expect
   and /bin/ksh to /usr/bin/ksh
-* Mon Oct 13 1997 - hf@suse.de
+* Mon Oct 13 1997 hf@suse.de
 - ready for autobuild
-* Fri Jun 06 1997 - bs@suse.de
+* Fri Jun 06 1997 bs@suse.de
 - removed usr/X11R6/lib/X11/fonts/misc/fonts.dir
-* Mon Jun 02 1997 - hf@suse.de
+* Mon Jun 02 1997 hf@suse.de
   Added the x3270 app-defaults file.
-* Wed May 21 1997 - hf@suse.de
+* Wed May 21 1997 hf@suse.de
   A new version 3.1.1.6
   x3270 is an IBM 3278/3279 terminal emulator for X windows.