rpms/tix/devel tix.spec,1.28,1.29

[Vitezslav Crhonek]

Author: vcrhonek

Update of /cvs/extras/rpms/tix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26095

Modified Files:
	tix.spec 
Log Message:
Merge review


Index: tix.spec
===================================================================
RCS file: /cvs/extras/rpms/tix/devel/tix.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tix.spec	28 Jul 2008 19:37:44 -0000	1.28
+++ tix.spec	9 Feb 2009 15:28:18 -0000	1.29
@@ -8,13 +8,12 @@
 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 @@
 %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 @@
 %doc %{tcl_sitelib}/Tix%{tixmajor}
 
 %changelog
+* Mon Feb  9 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1:8.4.3-2
+- Merge review
+  Resolves: #226493
+
 * Mon Jul 28 2008 Tom "spot" Callaway <tcallawa at 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