[tk] - New version 8.5.9 - Updated make patch - Removed color patch (integrated upstream) - Removed wmico

[Jaroslav Škarvada]

commit dece2be87db3d369271deec81ff7e644f388d5b0
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Oct 11 12:46:39 2010 +0200

    - New version 8.5.9
    - Updated make patch
    - Removed color patch (integrated upstream)
    - Removed wmiconphoto-fix patch (integrated upstream)

 .gitignore                     |    1 +
 sources                        |    2 +-
 tk-8.5.7-color.patch           |   10 ----
 tk-8.5.8-wmiconphoto-fix.patch |  106 ----------------------------------------
 tk.spec                        |   16 +++---
 tk8.5-make.patch               |    6 +-
 6 files changed, 13 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba86c1a..f07f559 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tk8.5.8-src.tar.gz
+/tk8.5.9-src.tar.gz
diff --git a/sources b/sources
index 9fba77a..8b3d6a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13bf90602e16fc530e05196431021dc6  tk8.5.8-src.tar.gz
+7cdeb9feb61593f58a0ae61f2497580e  tk8.5.9-src.tar.gz
diff --git a/tk.spec b/tk.spec
index 9198827..6c16df5 100644
--- a/tk.spec
+++ b/tk.spec
@@ -1,10 +1,10 @@
 %define majorver 8.5
-%define vers %{majorver}.8
+%define vers %{majorver}.9
 
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -25,10 +25,6 @@ Patch1: tk8.5-make.patch
 Patch2: tk8.5-conf.patch
 # this patch isn't needed since tk8.6b1
 Patch3: tk-seg_input.patch
-# RHBZ#545807, this patch is tracked in tk tracker
-Patch4: tk-8.5.7-color.patch
-# RHBZ#615750
-Patch5: tk-8.5.8-wmiconphoto-fix.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -53,8 +49,6 @@ The package contains the development files and man pages for tk.
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .seg
-%patch4 -p1 -b .color
-%patch5 -p1 -b .wmiconphoto-fix
 
 %build
 cd unix
@@ -122,6 +116,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 11 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.9-1
+- New version 8.5.9
+- Updated make patch
+- Removed color patch (integrated upstream)
+- Removed wmiconphoto-fix patch (integrated upstream)
+
 * Sun Jul 25 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.8-2
 - Fixed wm iconphoto #615750
 
diff --git a/tk8.5-make.patch b/tk8.5-make.patch
index 273c92c..27859e2 100644
--- a/tk8.5-make.patch
+++ b/tk8.5-make.patch
@@ -7,6 +7,6 @@ diff -up tk8.5.2/unix/Makefile.in.ble tk8.5.2/unix/Makefile.in
  	@@INSTALL_LIB@
 -	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
 +	@chmod 755 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
- 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
- 	    echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
- 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+ 	@echo "Installing wish at EXEEXT@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
+ 	@$(INSTALL_PROGRAM) wish at EXEEXT@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@EXEEXT@
+ 	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"