diff --git a/tix-8.1.4.tar.bz2 b/tix-8.1.4.tar.bz2
deleted file mode 100644
index c1c3c84..0000000
--- a/tix-8.1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e0122bd7a7072ae3e21c077abefd8779f6e882ddb9aea113ad454b493f78ba4
-size 1325508
diff --git a/tix-8.4.0.tar.bz2 b/tix-8.4.0.tar.bz2
new file mode 100644
index 0000000..fb1a4f5
--- /dev/null
+++ b/tix-8.4.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:593f903190fd75f4fac17408f33c51d77e18ad02cab540aad3209739a0ebaa3f
+size 1595187
diff --git a/tix.changes b/tix.changes
index 0ceb19e..d309e21 100644
--- a/tix.changes
+++ b/tix.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun  5 14:50:21 CEST 2007 - max@suse.de
+
+- New version: 8.4.0
+- Lots of cleanup and bugs fixed.
+- Better per-default compliance with rpmlint.
+- The 'tixwish' executable is gone.  Use tclsh or wish and load the
+  Tix package dynamically.
+
 -------------------------------------------------------------------
 Wed Jan 25 21:42:12 CET 2006 - mls@suse.de
 
diff --git a/tix.patch b/tix.patch
index a1cfe53..4e9651b 100644
--- a/tix.patch
+++ b/tix.patch
@@ -1,154 +1,58 @@
---- generic/tixDef.h
-+++ generic/tixDef.h
-@@ -19,9 +19,7 @@
- /*
-  * Include the defaults of the TK distriburion
-  */
--#ifndef _DEFAULT
--#include <default.h>
--#endif
-+#include <tkUnixDefault.h>
+--- Makefile.in
++++ Makefile.in
+@@ -93,12 +93,13 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ includedir	= @includedir@
++tclscriptdir	= $(libdir)
  
- #ifndef CTL_FONT
- #define CTL_FONT "Helvetica -12 bold"
---- unix/Makefile.in
-+++ unix/Makefile.in
-@@ -1,4 +1,4 @@
--# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*-
-+# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-8859-1 -*-
- #
- # $Id: Makefile.in,v 1.2.2.5 2002/12/02 04:02:52 idiscovery Exp $
- #
-@@ -16,6 +16,8 @@
- # the configuration script).
- #----------------------------------------------------------------
+ DESTDIR		=
  
-+DESTDIR=
-+
- # Default top-level directories in which to install architecture-
- # specific files (exec_prefix) and machine-independent files such
- # as scripts (prefix).  The values specified here may be overridden
-@@ -24,7 +26,10 @@
+ PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
+ pkgdatadir	= $(datadir)/$(PKG_DIR)
+-pkglibdir	= $(libdir)/$(PKG_DIR)
++pkglibdir	= $(tclscriptdir)/$(PKG_DIR)
+ pkgincludedir	= $(includedir)/$(PKG_DIR)
  
- prefix      =	@prefix@
- exec_prefix =	@exec_prefix@
--libdir	   =  $(exec_prefix)/lib
-+libdir	    =	@libdir@
-+mandir      =	@mandir@
-+tclscriptdir = $(libdir)
-+
+ top_builddir	= .
+@@ -296,7 +297,7 @@
+ 	(\
+ 	echo 'if {[catch {package require Tcl 8.4}]} return';\
+ 	echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
+-	    [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\
++	    [list load $(PKG_LIB_FILE) $(PACKAGE_NAME)]'\
+ 	) > pkgIndex.tcl
  
- @SET_MAKE@
+ #========================================================================
+@@ -327,23 +328,24 @@
+ #========================================================================
  
-@@ -33,19 +38,19 @@
- # Directory in which to install the library of Tix scripts and demos
- # (note: you can set the TIX_LIBRARY environment variable at run-time to
- # override the compiled-in location):
--TIX_LIBRARY =	$(libdir)/tix$(TIX_VERSION)
-+TIX_LIBRARY =	$(DESTDIR)$(tclscriptdir)/tix$(TIX_VERSION)
- 
- # Directory in which to install the archive libtix.a:
--LIB_DIR =	$(exec_prefix)/lib
-+LIB_DIR =	$(DESTDIR)$(libdir)
- 
- # Directory in which to install the program wish:
--BIN_DIR =	$(exec_prefix)/bin
-+BIN_DIR =	$(DESTDIR)$(exec_prefix)/bin
- 
- # Directory in which to install the include file tix.h:
--INCLUDE_DIR =	$(prefix)/include
-+INCLUDE_DIR =	$(DESTDIR)$(prefix)/include
- 
- # Top-level directory for manual entries:
--MAN_DIR =	$(prefix)/man
-+MAN_DIR =	$(DESTDIR)$(mandir)
- 
- # Directory in which to install manual entry for wish:
- MAN1_DIR =	$(MAN_DIR)/man1
---- unix/tk8.4/Makefile.in
-+++ unix/tk8.4/Makefile.in
-@@ -1,4 +1,4 @@
--# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*-
-+# -*-mode: makefile; fill-column: 75; tab-width: 8; coding: iso-8859-1 -*-
- #
- # $Id: Makefile.in,v 1.1.2.3 2002/12/11 07:18:41 idiscovery Exp $
- #
-@@ -22,6 +22,8 @@
- # the configuration script).
- #----------------------------------------------------------------
- 
-+DESTDIR=
-+
- # Default top-level directories in which to install architecture-
- # specific files (exec_prefix) and machine-independent files such
- # as scripts (prefix).  The values specified here may be overridden
-@@ -29,8 +31,9 @@
- # to the "configure" script.
- 
- prefix      = @prefix@
-+mandir      = @mandir@
- exec_prefix = @exec_prefix@
--libdir	   =  $(exec_prefix)/lib
-+libdir	    = @libdir@
- 
- TIX_VERSION = @TIX_VERSION@
- TCL_VERSION = @TCL_VERSION@
-@@ -40,15 +43,15 @@
- # Directory in which to install the library of Tix scripts and demos
- # (note: you can set the TIX_LIBRARY environment variable at run-time to
- # override the compiled-in location):
--TIX_LIBRARY =	$(libdir)/tix$(TIX_VERSION)
-+TIX_LIBRARY =	$(DESTDIR)$(libdir)/tix$(TIX_VERSION)
- 
- # Directory in which to install the archive libtix.a:
--LIB_DIR =	$(exec_prefix)/lib
-+LIB_DIR =	$(DESTDIR)$(libdir)
- LIB_INSTALL_DIR = $(LIB_DIR)
- LIB_RUNTIME_DIR = $(LIB_DIR)
- 
- # Directory in which to install the program tixwish:
--BIN_DIR =	$(exec_prefix)/bin
-+BIN_DIR =	$(DESTDIR)$(exec_prefix)/bin
- 
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
-@@ -497,7 +500,7 @@
+ install-lib-binaries:
+-	@mkdir -p $(DESTDIR)$(pkglibdir)
++	@mkdir -p $(DESTDIR)$(libdir)
+ 	@list='$(lib_BINARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+-	    echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-	    $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
++	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
++	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
++	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
+ 	    if test "x$$ext" = "xdll"; then \
+ 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
+ 		if test -f $$lib; then \
+-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
+-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
++		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
++	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
  		fi; \
- 	    done;
- 	@echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)"
--	@$(INSTALL_DATA) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
-+	@$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
- 	@echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)"
- 	@$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE)
- 	@echo "Installing tixConfig.sh"
---- unix/tk8.4/configure.in
-+++ unix/tk8.4/configure.in
-@@ -128,11 +128,11 @@
- if test "$ok" = "yes"; then
-     TIX_BUILD_SAM="yes"
-     TIX_SAM_TARGETS='$(SAM_TARGETS)'
-+    TIX_SAM_INSTALL=_install_sam_lib_
- else
-     TIX_BUILD_SAM="no"
- fi
- 
--	    TIX_SAM_INSTALL=_install_sam_lib_
- 
- IS_ITCL=0
- ITCL_BUILD_LIB_SPEC=""
-@@ -348,12 +348,12 @@
- AC_SUBST(TIX_VERSION_PKG)
- 
- TIXSAM_PKG_FILE="[[file join [file dirname \$dir] ${TIX_SAM_FILE}]]"
--# if test "$TIX_BUILD_SAM" = "yes"; then
-+if test "$TIX_BUILD_SAM" = "yes"; then
-     TIX_SAM_PACKAGE_IFNEEDED="package ifneeded Tixsam ${TIX_VERSION_PKG} [[list load \"${TIXSAM_PKG_FILE}\" Tixsam]]"
--# fi
-+fi
- 
- # The package file, usually a shared library
--TIX_PKG_FILE="[[file join [file dirname \$dir] ${TIX_LIB_FILE}]]"
-+TIX_PKG_FILE="${TIX_LIB_FILE}"
- AC_SUBST(TIX_PKG_FILE)
- AC_SUBST(TIX_SAM_PACKAGE_IFNEEDED)
- 
+ 	    fi; \
+ 	  fi; \
+ 	done
++	@mkdir -p $(DESTDIR)$(pkglibdir)
+ 	@echo "Installing library files to $(DESTDIR)$(pkglibdir)/$$destp";
+ 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
diff --git a/tix.spec b/tix.spec
index 8d74acb..b6f4531 100644
--- a/tix.spec
+++ b/tix.spec
@@ -1,32 +1,32 @@
 #
-# spec file for package tix (Version 8.1.4)
+# spec file for package tix (Version 8.4.0)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-Name:         tix
-BuildRequires: itcl tk-devel xorg-x11-devel
+Name:           tix
+BuildRequires:  itcl tk-devel xorg-x11-devel
 %define V_TIX   8.1.%tcl_version
 %define prefix	/usr
 %define mandir  /usr/share/man
-Version:      8.1.4
-Release:      78
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Summary:      Tools for tk
-Group:        Development/Libraries/Tcl
-Autoreqprov:  on
-Source:       %name-%version.tar.bz2
-Patch0:       %name.patch
-Group:        Development/Libraries/Tcl
-License:      distributable, Other License(s), see package
-Summary:      Tools for tk
-Provides:     tixwish tixwish%V_TIX
+Version:        8.4.0
+Release:        1
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Summary:        Tools for tk
+Group:          Development/Libraries/Tcl
+Autoreqprov:    on
+Source:         %name-%version.tar.bz2
+Patch0:         %name.patch
+Group:          Development/Libraries/Tcl
+License:        Public Domain, Freeware, docs/license.tcltk docs/license.html_lib.
+Summary:        Tools for tk
+Provides:       tixwish tixwish%V_TIX
 
 %description
 The Tix library has, by far, the greatest collection of widgets for
@@ -41,61 +41,50 @@ in intuitive ways.
 
 %prep
 %setup -q 
-find -name .cvsignore | xargs rm -fv
-%patch
-find -name configure | xargs chmod a+rx
+%patch0
+find docs -type f | xargs chmod a-x
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-CONFIGURE_OPTS="
- --with-tclconfig=%_libdir
- --with-tkconfig=%_libdir
- --with-tclinclude=%_includedir
- --with-tkinclude=%_includedir
- --enable-gcc
- --disable-sam
- --enable-shared
- --prefix=%_prefix
- --libdir=%_libdir
- --mandir=%_mandir
-"
-chmod a+x install.sh
-cd unix
-autoconf --force
-./configure $CONFIGURE_OPTS
-cd tk%tcl_version 
-autoconf --force
-./configure $CONFIGURE_OPTS
-make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+./configure \
+	--with-tcl=%_libdir \
+	--with-tk=%_libdir \
+	--prefix=%_prefix \
+	--libdir=%_libdir \
+	--mandir=%_mandir
+make
 
 %install
-export LD_LIBRARY_PATH=$PWD/%{TCL}/unix
-cd unix
-#mkdir -p %buildroot/{%_prefix,%_libdir,%_mandir}
-mkdir -p %buildroot%tclscriptdir
-make install \
+make install-binaries install-libraries \
 	DESTDIR=%buildroot \
 	tclscriptdir=%tclscriptdir
-mv %buildroot%_mandir/mann/tixwish.1 %buildroot%_mandir/man1
-ln -sf tixwish%V_TIX %buildroot%{_prefix}/bin/tixwish
+MANN=%buildroot/%_mandir/mann
+mkdir -p $MANN
+pushd man
+for f in *.n; do
+  sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' $f > $MANN/$f
+done
+popd
 
 %clean
 rm -rf %buildroot
 
 %files
 %defattr(-,root,root)
-%doc ABOUT* README* docs Roadmap.html TODO.html
-%doc demos/c-code
-%doc demos/et
+%doc ABOUT* README* ChangeLog license.terms index.html
+%doc docs
 %doc %_mandir/*/*
-%_bindir/*
 %_libdir/lib*
-%_libdir/tixConfig.sh
 
 %tclscriptdir/*
-%_includedir/*
 
-%changelog -n tix
+%changelog
+* Tue Jun 05 2007 - max@suse.de
+- New version: 8.4.0
+- Lots of cleanup and bugs fixed.
+- Better per-default compliance with rpmlint.
+- The 'tixwish' executable is gone.  Use tclsh or wish and load the
+  Tix package dynamically.
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Fri Jul 29 2005 - max@suse.de