From ebbe6bb1381ce383bd91f1414e537e11262a423d Mon Sep 17 00:00:00 2001
From: vcrhonek <vcrhonek@fedoraproject.org>
Date: Mon, 9 Feb 2009 15:28:18 +0000
Subject: [PATCH] Merge review

---
 tix.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tix.spec b/tix.spec
index b0b2863..e850fde 100644
--- a/tix.spec
+++ b/tix.spec
@@ -8,13 +8,12 @@ Summary: A set of extension widgets for Tk
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/tix/Tix%{version}-src.tar.gz
 Patch0: tix-8.4.2-link.patch
-Patch1: tix-8.4.2-tcl8.5.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: tcl(abi) = 8.5
 Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
@@ -58,7 +57,13 @@ This package contains the tix documentation
 %prep
 %setup -q -n Tix%{version}
 %patch0 -p1 -b .link
-# %%patch1 -p1 -b .err
+
+# Remove executable permission of images in html documentation
+chmod ugo-x docs/html/gif/tix/*.png docs/html/gif/tix/*.gif \
+  docs/html/gif/tix/*/*.gif
+
+# Fix end-of-line encoding
+sed -i 's/\r//' docs/Release-8.4.0.txt
 
 %build
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
@@ -127,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{tcl_sitelib}/Tix%{tixmajor}
 
 %changelog
+* Mon Feb  9 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1:8.4.3-2
+- Merge review
+  Resolves: #226493
+
 * Mon Jul 28 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1:8.4.3-1
 - update to 8.4.3
 - don't apply tix-8.4.2-tcl8.5.patch, no longer needed