- Update to 8.5.8

.cvsignore

@@ -1 +1 @@
-tk8.5.7-src.tar.gz
+tk8.5.8-src.tar.gz

sources

@@ -1 +1 @@
-0764f63ae2106b4774c4ecb0ef391610  tk8.5.7-src.tar.gz
+13bf90602e16fc530e05196431021dc6  tk8.5.8-src.tar.gz

tk-8.5.7-color.patch

@@ -0,0 +1,10 @@
+--- tk8.5.7/generic/tkColor.c.color	2007-12-13 16:24:13.000000000 +0100
++++ tk8.5.7/generic/tkColor.c	2009-12-09 19:22:12.207246662 +0100
+@@ -302,6 +302,7 @@
+      * First, check to see if there's already a mapping for this color name.
+      */
+ 
++    memset(&valueKey, 0, sizeof(valueKey));
+     valueKey.red = colorPtr->red;
+     valueKey.green = colorPtr->green;
+     valueKey.blue = colorPtr->blue;

tk.spec

@@ -1,10 +1,10 @@
 %define majorver 8.5
-%define vers %{majorver}.7
+%define vers %{majorver}.8
 
 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,6 +25,8 @@ 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
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -49,6 +51,7 @@ 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
 
 %build
 cd unix
@@ -66,13 +69,13 @@ make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 %endif
 
 %install
-rm -rf %{buildroot}
-make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
+rm -rf $RPM_BUILD_ROOT
+make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
-ln -s wish%{majorver} %{buildroot}%{_bindir}/wish
+ln -s wish%{majorver} $RPM_BUILD_ROOT%{_bindir}/wish
 
 # for linking with -l%{name}
-ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
+ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
 
 mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic/ttk,unix}
 find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
@@ -88,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tkAppInit.c
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/prolog.ps
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %pre
 [ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver}
@@ -116,6 +119,15 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Mar 18 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.5.8-1
+- Update to 8.5.8
+
+* Fri Feb 26 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.5.7-4
+- Fixed macro/variable conflict in spec
+
+* Wed Dec 9 2009 Nikola Pajkovsky <npajkovs@redhat.com> - 1:8.5.7-3
+- Resolves: #545807 - Color hash problem on x86_64
+
 * Tue Aug 11 2009 Nikola Pajkovsky <npajkovs@redhat.com> - 1:8.5.7-2
 - Fix Source0 url