From e974baeb1eb8da0bccfd39a1e7b76fdc46a60d8cb9d9078eea71d7611b49eb7b Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Wed, 25 May 2011 09:56:46 +0000
Subject: [PATCH] Fix build and cleanup package

OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/vtcl?expand=0&rev=6
---
 tkcon_allow_858.diff                       | 17 -----------------
 default_browser.diff => vtcl-browser.patch |  6 ++----
 vtcl-tkversion.patch                       | 18 +++++++++---------
 vtcl.changes                               |  6 ++++++
 vtcl.spec                                  |  9 ++-------
 5 files changed, 19 insertions(+), 37 deletions(-)
 delete mode 100644 tkcon_allow_858.diff
 rename default_browser.diff => vtcl-browser.patch (55%)

diff --git a/tkcon_allow_858.diff b/tkcon_allow_858.diff
deleted file mode 100644
index 03e878b..0000000
--- a/tkcon_allow_858.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- lib/tkcon.tcl |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: vtcl-1.6.1a1/lib/tkcon.tcl
-===================================================================
---- vtcl-1.6.1a1.orig/lib/tkcon.tcl
-+++ vtcl-1.6.1a1/lib/tkcon.tcl
-@@ -40,7 +40,7 @@
- if {$tcl_version < 8.0} {
-     return -code error "tkcon requires at least Tcl/Tk8"
- } else {
--    package require -exact Tk $tcl_version
-+    package require Tk $tcl_version
- }
- 
- # We need to load some package to get what's available, and we
diff --git a/default_browser.diff b/vtcl-browser.patch
similarity index 55%
rename from default_browser.diff
rename to vtcl-browser.patch
index b0bff25..8214da8 100644
--- a/default_browser.diff
+++ b/vtcl-browser.patch
@@ -1,7 +1,5 @@
-Index: vtcl-1.6.1a1/lib/misc.tcl
-===================================================================
---- vtcl-1.6.1a1.orig/lib/misc.tcl
-+++ vtcl-1.6.1a1/lib/misc.tcl
+--- lib/misc.tcl
++++ lib/misc.tcl
 @@ -1172,7 +1172,7 @@ proc ::vTcl::web_browser {} {
      	#if {![file executable [file join $path netscape]]} { continue }
  	
diff --git a/vtcl-tkversion.patch b/vtcl-tkversion.patch
index 182fb25..0d73a4b 100644
--- a/vtcl-tkversion.patch
+++ b/vtcl-tkversion.patch
@@ -1,11 +1,11 @@
 --- lib/tkcon.tcl
 +++ lib/tkcon.tcl
-@@ -21,7 +21,7 @@
- if {$tcl_version < 8.0} {
-     return -code error "TkCon requires at least Tcl/Tk8"
- } else {
--    package require -exact Tk $tcl_version
-+    package require Tk $tcl_version
- }
- 
- ## for Tcl/Tk 8.4
+@@ -40,7 +40,7 @@
+ if {$tcl_version < 8.0} {
+     return -code error "tkcon requires at least Tcl/Tk8"
+ } else {
+-    package require -exact Tk $tcl_version
++    package require Tk $tcl_version
+ }
+ 
+ # We need to load some package to get what's available, and we
diff --git a/vtcl.changes b/vtcl.changes
index 3a5bfc0..bbb5b27 100644
--- a/vtcl.changes
+++ b/vtcl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 25 09:56:15 UTC 2011 - max@novell.com
+
+- Fix build
+- Package cleanup
+
 -------------------------------------------------------------------
 Wed Nov 17 11:40:20 CET 2010 - max@suse.de
 
diff --git a/vtcl.spec b/vtcl.spec
index b5e3342..9dd2e50 100644
--- a/vtcl.spec
+++ b/vtcl.spec
@@ -31,8 +31,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://sourceforge.net/projects/vtcl/files/%name-%version.tar.bz2
 Source1:        vtcl
 Patch0:         vtcl-tkversion.patch
-#Patch1:	tkcon_allow_858.diff
-Patch2:		default_browser.diff
+Patch2:		vtcl-browser.patch
 BuildArch:      noarch
 
 %description
@@ -50,11 +49,7 @@ Authors:
 %prep
 %setup -q
 %patch0
-
-## 1:tkcon_allow_858.diff
-#%patch1 -p1	
-# 2:default_browser.diff
-%patch2 -p1
+%patch1
 
 %build
 #