From ab49c76752c9003101363dbbac9971eb5a102cfc Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Sat, 18 Nov 2006 04:04:14 +0000
Subject: [PATCH] - Update to tix-8.4.2

---
 .cvsignore |  3 +--
 sources    |  2 +-
 tix.spec   | 53 +++++++++++++++++++++--------------------------------
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c36aed5..4f7323f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-tix-8.1.4.tar.gz
-tix-8.4.0.tar.gz
+Tix8.4.2-src.tar.gz
diff --git a/sources b/sources
index 5baf2a5..1984558 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fcd84a1a6e27e432cb07284b7a34317  tix-8.4.0.tar.gz
+422a4e1c5f64da203c753a596b0d74de  Tix8.4.2-src.tar.gz
diff --git a/tix.spec b/tix.spec
index cf73118..e14fb88 100644
--- a/tix.spec
+++ b/tix.spec
@@ -4,19 +4,17 @@
 Summary: A set of extension widgets for Tk
 Name: tix
 Epoch: 1
-Version: %{tixmajor}.0
-Release: 11%{?dist}
+Version: %{tixmajor}.2
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
-Source0: http://tix.sourceforge.net/dist/tix-%{version}.tar.gz
-Patch0: tix-%{version}-relid.patch
-Patch1: tix-%{version}-soname.patch
-Patch2: tix-%{version}-cflags.patch
+Source0: http://dl.sourceforge.net/sourceforge/tix/Tix%{version}-src.tar.gz
+Patch0: tix-8.4.2-link.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
 Buildrequires: tcl-devel >= %{tcltkver}, tk-devel >= %{tcltkver}
-BuildRequires: libX11-devel, autoconf
+BuildRequires: libX11-devel
 
 %description
 Tix, the Tk Interface eXtension, is a powerful set of user interface
@@ -52,32 +50,24 @@ appearance and functionality of your application.
 This package contains the tix documentation
 
 %prep
-%setup -q
-%patch0 -p1 -b .relid
-%patch1 -p1 -b .soname
-%patch2 -p1 -b .cflags
-
-# patch 0 touches tcl.m4
-autoconf
+%setup -q -n Tix%{version}
+%patch0 -p1 -b .link
 
 %build
-%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-64bit
-make all %{?_smp_mflags}
+%configure
+make all %{?_smp_mflags} PKG_LIB_FILE=libTix%{tixmajor}.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PKG_LIB_FILE=libTix%{tixmajor}.so
 
 # move shared lib
-rm -f $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
-mv $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
-( cd $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}
-  ln -sf ../libTix%{tixmajor}.so .
-)
-( cd $RPM_BUILD_ROOT%{_libdir}
-  ln -sf libTix%{tixmajor}.so libTix.so
-  ln -sf libTix%{tixmajor}.so libtix.so
-)
+mv $RPM_BUILD_ROOT%{_libdir}/Tix%{version}/libTix%{tixmajor}.so \
+	$RPM_BUILD_ROOT%{_libdir}
+ln -sf ../libTix%{tixmajor}.so \
+	$RPM_BUILD_ROOT%{_libdir}/Tix%{version}/libTix%{tixmajor}.so
+ln -sf libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix.so
+ln -sf libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libtix.so
 
 # install demo scripts
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor}
@@ -108,11 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libTix%{tixmajor}.so
-%dir %{_libdir}/Tix%{tixmajor}
-%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so
-%{_libdir}/Tix%{tixmajor}/*.tcl
-%{_libdir}/Tix%{tixmajor}/bitmaps
-%{_libdir}/Tix%{tixmajor}/pref
+%{_libdir}/Tix%{version}
 %{_datadir}/Tix%{tixmajor}
 %doc *.txt *.html license.terms
 
@@ -121,13 +107,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/tix.h
 %{_libdir}/libtix.so
 %{_libdir}/libTix.so
-%{_mandir}/mann
+%{_mandir}/mann/*.n*
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/*
 
 %changelog
+* Sat Nov 18 2006 Miloslav Trmac <mitr@redhat.com> - 1:8.4.2-1
+- Update to tix-8.4.2
+
 * Thu Jul 20 2006 David Cantrell <dcantrell@redhat.com> - 1:8.4.0-11
 - Patch from Dennis Gilmore <dennis@ausil.us> for sparc64 (#199377)