OBS User unknown 2007-06-07 11:16:30 +00:00 committed by Git OBS Bridge
parent 7d36f31924
commit b5247e66c8
5 changed files with 108 additions and 206 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e0122bd7a7072ae3e21c077abefd8779f6e882ddb9aea113ad454b493f78ba4
size 1325508

3
tix-8.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:593f903190fd75f4fac17408f33c51d77e18ad02cab540aad3209739a0ebaa3f
size 1595187

View File

@ -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 Wed Jan 25 21:42:12 CET 2006 - mls@suse.de

200
tix.patch
View File

@ -1,154 +1,58 @@
--- generic/tixDef.h --- Makefile.in
+++ generic/tixDef.h +++ Makefile.in
@@ -19,9 +19,7 @@ @@ -93,12 +93,13 @@
/* datadir = @datadir@
* Include the defaults of the TK distriburion mandir = @mandir@
*/ includedir = @includedir@
-#ifndef _DEFAULT +tclscriptdir = $(libdir)
-#include <default.h>
-#endif
+#include <tkUnixDefault.h>
#ifndef CTL_FONT DESTDIR =
#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= PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
+ pkgdatadir = $(datadir)/$(PKG_DIR)
# Default top-level directories in which to install architecture- -pkglibdir = $(libdir)/$(PKG_DIR)
# specific files (exec_prefix) and machine-independent files such +pkglibdir = $(tclscriptdir)/$(PKG_DIR)
# as scripts (prefix). The values specified here may be overridden pkgincludedir = $(includedir)/$(PKG_DIR)
@@ -24,7 +26,10 @@
prefix = @prefix@ top_builddir = .
exec_prefix = @exec_prefix@ @@ -296,7 +297,7 @@
-libdir = $(exec_prefix)/lib (\
+libdir = @libdir@ echo 'if {[catch {package require Tcl 8.4}]} return';\
+mandir = @mandir@ echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
+tclscriptdir = $(libdir) - [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 @@ install-lib-binaries:
# Directory in which to install the library of Tix scripts and demos - @mkdir -p $(DESTDIR)$(pkglibdir)
# (note: you can set the TIX_LIBRARY environment variable at run-time to + @mkdir -p $(DESTDIR)$(libdir)
# override the compiled-in location): @list='$(lib_BINARIES)'; for p in $$list; do \
-TIX_LIBRARY = $(libdir)/tix$(TIX_VERSION) if test -f $$p; then \
+TIX_LIBRARY = $(DESTDIR)$(tclscriptdir)/tix$(TIX_VERSION) - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
# Directory in which to install the archive libtix.a: - echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-LIB_DIR = $(exec_prefix)/lib - $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+LIB_DIR = $(DESTDIR)$(libdir) + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
# Directory in which to install the program wish: + echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-BIN_DIR = $(exec_prefix)/bin + $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+BIN_DIR = $(DESTDIR)$(exec_prefix)/bin ext=`echo $$p|sed -e "s/.*\.//"`; \
if test "x$$ext" = "xdll"; then \
# Directory in which to install the include file tix.h: lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
-INCLUDE_DIR = $(prefix)/include if test -f $$lib; then \
+INCLUDE_DIR = $(DESTDIR)$(prefix)/include - echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
# Top-level directory for manual entries: + echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-MAN_DIR = $(prefix)/man + $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
+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 @@
fi; \ fi; \
done; fi; \
@echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)" fi; \
- @$(INSTALL_DATA) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE) done
+ @$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE) + @mkdir -p $(DESTDIR)$(pkglibdir)
@echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)" @echo "Installing library files to $(DESTDIR)$(pkglibdir)/$$destp";
@$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE) @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
@echo "Installing tixConfig.sh" if test -f $(srcdir)/$$p; then \
--- 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)

View File

@ -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 # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # 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 # norootforbuild
Name: tix Name: tix
BuildRequires: itcl tk-devel xorg-x11-devel BuildRequires: itcl tk-devel xorg-x11-devel
%define V_TIX 8.1.%tcl_version %define V_TIX 8.1.%tcl_version
%define prefix /usr %define prefix /usr
%define mandir /usr/share/man %define mandir /usr/share/man
Version: 8.1.4 Version: 8.4.0
Release: 78 Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Tools for tk Summary: Tools for tk
Group: Development/Libraries/Tcl Group: Development/Libraries/Tcl
Autoreqprov: on Autoreqprov: on
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Patch0: %name.patch Patch0: %name.patch
Group: Development/Libraries/Tcl Group: Development/Libraries/Tcl
License: distributable, Other License(s), see package License: Public Domain, Freeware, docs/license.tcltk docs/license.html_lib.
Summary: Tools for tk Summary: Tools for tk
Provides: tixwish tixwish%V_TIX Provides: tixwish tixwish%V_TIX
%description %description
The Tix library has, by far, the greatest collection of widgets for The Tix library has, by far, the greatest collection of widgets for
@ -41,61 +41,50 @@ in intuitive ways.
%prep %prep
%setup -q %setup -q
find -name .cvsignore | xargs rm -fv %patch0
%patch find docs -type f | xargs chmod a-x
find -name configure | xargs chmod a+rx
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
CONFIGURE_OPTS=" ./configure \
--with-tclconfig=%_libdir --with-tcl=%_libdir \
--with-tkconfig=%_libdir --with-tk=%_libdir \
--with-tclinclude=%_includedir --prefix=%_prefix \
--with-tkinclude=%_includedir --libdir=%_libdir \
--enable-gcc --mandir=%_mandir
--disable-sam make
--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"
%install %install
export LD_LIBRARY_PATH=$PWD/%{TCL}/unix make install-binaries install-libraries \
cd unix
#mkdir -p %buildroot/{%_prefix,%_libdir,%_mandir}
mkdir -p %buildroot%tclscriptdir
make install \
DESTDIR=%buildroot \ DESTDIR=%buildroot \
tclscriptdir=%tclscriptdir tclscriptdir=%tclscriptdir
mv %buildroot%_mandir/mann/tixwish.1 %buildroot%_mandir/man1 MANN=%buildroot/%_mandir/mann
ln -sf tixwish%V_TIX %buildroot%{_prefix}/bin/tixwish 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 %clean
rm -rf %buildroot rm -rf %buildroot
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc ABOUT* README* docs Roadmap.html TODO.html %doc ABOUT* README* ChangeLog license.terms index.html
%doc demos/c-code %doc docs
%doc demos/et
%doc %_mandir/*/* %doc %_mandir/*/*
%_bindir/*
%_libdir/lib* %_libdir/lib*
%_libdir/tixConfig.sh
%tclscriptdir/* %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 * Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Fri Jul 29 2005 - max@suse.de * Fri Jul 29 2005 - max@suse.de