From d98f3f848bbb94a7b7a8d0ddf1688f08049f791d5dcb2ef1039225171c26a22c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 6 Apr 2008 07:08:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tix?expand=0&rev=3 --- Tix8.4.3-src.tar.bz2 | 3 ++ tix-8.4.0.tar.bz2 | 3 -- tix.changes | 5 ++++ tix.patch | 67 +++++++----------------------------------- tix.spec | 70 +++++++++++++++++++++++--------------------- 5 files changed, 55 insertions(+), 93 deletions(-) create mode 100644 Tix8.4.3-src.tar.bz2 delete mode 100644 tix-8.4.0.tar.bz2 diff --git a/Tix8.4.3-src.tar.bz2 b/Tix8.4.3-src.tar.bz2 new file mode 100644 index 0000000..7055631 --- /dev/null +++ b/Tix8.4.3-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54408c207456f4054e5680b1d932599e880e674bb3de3d1847a7f81b0b0b3b66 +size 1598352 diff --git a/tix-8.4.0.tar.bz2 b/tix-8.4.0.tar.bz2 deleted file mode 100644 index fb1a4f5..0000000 --- a/tix-8.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:593f903190fd75f4fac17408f33c51d77e18ad02cab540aad3209739a0ebaa3f -size 1595187 diff --git a/tix.changes b/tix.changes index d309e21..37b512f 100644 --- a/tix.changes +++ b/tix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 4 17:58:54 CEST 2008 - max@suse.de + +- New version 8.4.3, works with Tcl/Tk 8.5. + ------------------------------------------------------------------- Tue Jun 5 14:50:21 CEST 2007 - max@suse.de diff --git a/tix.patch b/tix.patch index 4e9651b..bcf13cf 100644 --- a/tix.patch +++ b/tix.patch @@ -1,58 +1,13 @@ ---- Makefile.in -+++ Makefile.in -@@ -93,12 +93,13 @@ - datadir = @datadir@ - mandir = @mandir@ - includedir = @includedir@ -+tclscriptdir = $(libdir) +--- configure.in ++++ configure.in +@@ -100,8 +100,8 @@ + #-------------------------------------------------------------------- - DESTDIR = + # needed for tclPort.h and such ... can be corrected +-TEA_PRIVATE_TCL_HEADERS +-TEA_PRIVATE_TK_HEADERS ++TEA_PUBLIC_TCL_HEADERS ++TEA_PUBLIC_TK_HEADERS - PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) - pkgdatadir = $(datadir)/$(PKG_DIR) --pkglibdir = $(libdir)/$(PKG_DIR) -+pkglibdir = $(tclscriptdir)/$(PKG_DIR) - pkgincludedir = $(includedir)/$(PKG_DIR) - - 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 - - #======================================================================== -@@ -327,23 +328,24 @@ - #======================================================================== - - 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; \ - 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 \ + #-------------------------------------------------------------------- + # For Unix/Tk builds, make sure that the X libraries/headers are found. diff --git a/tix.spec b/tix.spec index b6f4531..f9f72fb 100644 --- a/tix.spec +++ b/tix.spec @@ -1,7 +1,7 @@ # -# spec file for package tix (Version 8.4.0) +# spec file for package tix (Version 8.4.3) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -10,21 +10,22 @@ # norootforbuild + Name: tix -BuildRequires: itcl tk-devel xorg-x11-devel +BuildRequires: fdupes itcl tk-devel xorg-x11-devel %define V_TIX 8.1.%tcl_version %define prefix /usr %define mandir /usr/share/man -Version: 8.4.0 +Version: 8.4.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tools for tk Group: Development/Libraries/Tcl -Autoreqprov: on -Source: %name-%version.tar.bz2 +AutoReqProv: on +Source: Tix%version-src.tar.bz2 Patch0: %name.patch Group: Development/Libraries/Tcl -License: Public Domain, Freeware, docs/license.tcltk docs/license.html_lib. +License: Public Domain, Freeware Summary: Tools for tk Provides: tixwish tixwish%V_TIX @@ -40,11 +41,12 @@ in intuitive ways. %prep -%setup -q +%setup -q -n Tix%version %patch0 find docs -type f | xargs chmod a-x %build +autoreconf export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \ --with-tcl=%_libdir \ @@ -55,9 +57,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make %install -make install-binaries install-libraries \ +make install \ DESTDIR=%buildroot \ - tclscriptdir=%tclscriptdir + libdir=%_libdir/tcl MANN=%buildroot/%_mandir/mann mkdir -p $MANN pushd man @@ -72,63 +74,63 @@ rm -rf %buildroot %files %defattr(-,root,root) %doc ABOUT* README* ChangeLog license.terms index.html -%doc docs +%doc docs/Release* docs/*html docs/img docs/pdf/* demos %doc %_mandir/*/* -%_libdir/lib* - -%tclscriptdir/* +%_libdir/tcl %changelog -* Tue Jun 05 2007 - max@suse.de +* Fri Apr 04 2008 max@suse.de +- New version 8.4.3, works with Tcl/Tk 8.5. +* 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 +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jul 29 2005 - max@suse.de +* Fri Jul 29 2005 max@suse.de - Moved script library to /usr/share/tcl . -* Thu Feb 05 2004 - max@suse.de +* Thu Feb 05 2004 max@suse.de - Building as a shared lib again. - Added -fno-strict-aliasing to CFLAGS. -* Thu Jan 15 2004 - max@suse.de +* Thu Jan 15 2004 max@suse.de - New version: 8.1.4 -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - build as user -* Wed Jul 23 2003 - max@suse.de +* Wed Jul 23 2003 max@suse.de - Added tk-devel to neededforbuild. -* Wed May 21 2003 - ro@suse.de +* Wed May 21 2003 ro@suse.de - remove .cvsignore files - fix filelist -* Mon Nov 11 2002 - ro@suse.de +* Tue Nov 12 2002 ro@suse.de - changed neededforbuild to - changed neededforbuild to <> -* Tue Jul 09 2002 - max@suse.de +* Tue Jul 09 2002 max@suse.de - Ready for Tcl/Tk 8.4. - Doesn't break on KDE3 anymore [Bug #16428]. -* Wed Apr 10 2002 - max@suse.de +* Wed Apr 10 2002 max@suse.de - Fixed for new version of autobuild. -* Wed Feb 20 2002 - max@suse.de +* Wed Feb 20 2002 max@suse.de - Fixed for lib64-s390x. -* Thu Jan 17 2002 - max@suse.de +* Thu Jan 17 2002 max@suse.de - New version 8.1.3 - Tix is a separate package again. The new version is able to build without having the Tcl/Tk sources at hand. - Don't build static libs anymore. -* Tue Nov 24 1998 - max@suse.de +* Tue Nov 24 1998 max@suse.de - merged spec-files into tcl_new.spec -* Mon Nov 23 1998 - max@suse.de +* Mon Nov 23 1998 max@suse.de - building with new Tcl/Tk version: 8.0.4 - tixwish is now dynamically linked to libtcl -* Wed Sep 23 1998 - ro@suse.de +* Wed Sep 23 1998 ro@suse.de - added to specfile: applx patch for tcl8.0 -* Thu May 14 1998 - hf@suse.de +* Thu May 14 1998 hf@suse.de - english and german README.SuSE -* Mon Feb 23 1998 - hf@suse.de +* Mon Feb 23 1998 hf@suse.de - changed README.SuSE -* Mon Feb 16 1998 - hf@suse.de +* Mon Feb 16 1998 hf@suse.de - changes in spec file -* Thu Feb 05 1998 - hf@suse.de +* Thu Feb 05 1998 hf@suse.de new package Tix for Tcl/Tk 8.0 and new directorypath to tcl/tk in /usr/lib/tcltk