rpms/ds9/F-8 ds9-external.patch,1.1,1.2 ds9.spec,1.1,1.2
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Sat Dec 8 23:31:01 UTC 2007
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29670
Modified Files:
ds9-external.patch ds9.spec
Log Message:
* Sat Dec 08 2007 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-6
- Fixed problems with TCL package loading
ds9-external.patch:
Index: ds9-external.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-8/ds9-external.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-external.patch 4 Dec 2007 11:02:00 -0000 1.1
+++ ds9-external.patch 8 Dec 2007 23:30:57 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
---- saods9.orig/ds9/ds9.C 2007-06-19 19:13:04.000000000 +0200
-+++ saods9/ds9/ds9.C 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/ds9/ds9.C saods9.new/ds9/ds9.C
+--- saods9/ds9/ds9.C 2007-06-19 19:13:04.000000000 +0200
++++ saods9.new/ds9/ds9.C 2007-12-08 16:36:40.000000000 +0100
@@ -10,8 +10,8 @@
void TclSetStartupScriptFileName(const char*);
@@ -78,7 +78,7 @@
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "BLT", "2.4", 0);
++ //Tcl_PkgRequire(interp, "BLT", "2.4", 0);
// Tktable
- if (Tktable_Init(interp) == TCL_ERROR)
+ /*if (Tktable_Init(interp) == TCL_ERROR)
@@ -86,7 +86,7 @@
Tcl_StaticPackage (interp, "Tktable", Tktable_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "Tktable", "2.9", 0);
++ //Tcl_PkgRequire(interp, "Tktable", "2.9", 0);
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
@@ -101,7 +101,7 @@
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
+
-+ Tcl_PkgRequire(interp, "Tclxpa", "1.0", 0);
++ //Tcl_PkgRequire(interp, "Tclxpa", "1.0", 0);
// IIS
if (Iis_Init(interp) == TCL_ERROR)
@@ -116,7 +116,7 @@
- Tkimg_Init,(Tcl_PackageInitProc*)NULL);
+ Tkimg_Init,(Tcl_PackageInitProc*)NULL);*/
+
-+ Tcl_PkgRequire(interp, "img", "1.3", 0);
++ //Tcl_PkgRequire(interp, "img", "1.3", 0);
// zlibtcl
- if (Zlibtcl_Init(interp) == TCL_ERROR)
@@ -125,7 +125,7 @@
Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "zlibtcl", "1.2", 0);
++ //Tcl_PkgRequire(interp, "zlibtcl", "1.2", 0);
// jpegtcl
- if (Jpegtcl_Init(interp) == TCL_ERROR)
@@ -134,7 +134,7 @@
Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "jpegtcl", "1.0", 0);
++ //Tcl_PkgRequire(interp, "jpegtcl", "1.0", 0);
// Tkimgjpeg
- if (Tkimgjpeg_Init(interp) == TCL_ERROR)
@@ -143,7 +143,7 @@
Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "jpeg", "1.3", 0);
++ //Tcl_PkgRequire(interp, "jpeg", "1.3", 0);
// Tifftcl
- if (Tifftcl_Init(interp) == TCL_ERROR)
@@ -152,7 +152,7 @@
Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "tifftcl", "3.8.2", 0);
++ //Tcl_PkgRequire(interp, "tifftcl", "3.8.2", 0);
// Tkimgtiff
- if (Tkimgtiff_Init(interp) == TCL_ERROR)
@@ -161,7 +161,7 @@
Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "tiff", "1.3", 0);
++ //Tcl_PkgRequire(interp, "tiff", "1.3", 0);
// Pngtcl
- if (Pngtcl_Init(interp) == TCL_ERROR)
@@ -170,7 +170,7 @@
Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "pngtcl", "1.2.12", 0);
++ //Tcl_PkgRequire(interp, "pngtcl", "1.2.12", 0);
// Tkimgpng
- if (Tkimgpng_Init(interp) == TCL_ERROR)
@@ -179,7 +179,7 @@
Tcl_StaticPackage (interp, "png", Tkimgpng_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "png", "1.3", 0);
++ //Tcl_PkgRequire(interp, "png", "1.3", 0);
// Tkimggif
- if (Tkimggif_Init(interp) == TCL_ERROR)
@@ -188,7 +188,7 @@
Tcl_StaticPackage (interp, "gif", Tkimggif_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "gif", "1.3", 0);
++ //Tcl_PkgRequire(interp, "gif", "1.3", 0);
// Tkimgppm
- if (Tkimgppm_Init(interp) == TCL_ERROR)
@@ -198,7 +198,7 @@
- (Tcl_PackageInitProc*)NULL);
-
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "ppm", "1.3", 0);
++ //Tcl_PkgRequire(interp, "ppm", "1.3", 0);
// Tkimgbmp
- if (Tkimgbmp_Init(interp) == TCL_ERROR)
+/* if (Tkimgbmp_Init(interp) == TCL_ERROR)
@@ -206,7 +206,7 @@
Tcl_StaticPackage (interp, "bmp", Tkimgbmp_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "bpm", "1.3", 0);
++ //Tcl_PkgRequire(interp, "bpm", "1.3", 0);
+ // Tkimgbmp
// Tkimgxbm
@@ -217,7 +217,7 @@
- (Tcl_PackageInitProc*)NULL);
-
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "bpm", "1.3", 0);
++ //Tcl_PkgRequire(interp, "bpm", "1.3", 0);
// Tkimgwindow
- if (Tkimgwindow_Init(interp) == TCL_ERROR)
+ /*if (Tkimgwindow_Init(interp) == TCL_ERROR)
@@ -225,7 +225,7 @@
Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ Tcl_PkgRequire(interp, "window", "1.3", 0);
++ //Tcl_PkgRequire(interp, "window", "1.3", 0);
#ifdef _MACOSX
if (Tkmacosx_Init(interp) == TCL_ERROR)
@@ -234,22 +234,20 @@
// Variables
- Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY);
-- Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.4", TCL_GLOBAL_ONLY);
-- Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
-- Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
++/* Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY);
+ Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.4", TCL_GLOBAL_ONLY);
+ Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
+ Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY);
- Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY);
-+ Tcl_SetVar(interp, "blt_library", LIBDIR"/blt2.4", TCL_GLOBAL_ONLY);
-+
-+
-+
-+
-+
++ Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY)
++ Tcl_SetVar(interp, "blt_library", LIBDIR"/blt2.4", TCL_GLOBAL_ONLY);*/
//Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY);
-diff -ur saods9.orig/ds9/Makefile saods9/ds9/Makefile
---- saods9.orig/ds9/Makefile 2007-10-02 22:39:33.000000000 +0200
-+++ saods9/ds9/Makefile 2007-12-04 10:19:19.000000000 +0100
+Sólo en saods9.new/ds9: .ds9.C.swp
+diff -ur saods9/ds9/Makefile saods9.new/ds9/Makefile
+--- saods9/ds9/Makefile 2007-10-02 22:39:33.000000000 +0200
++++ saods9.new/ds9/Makefile 2007-12-08 16:36:40.000000000 +0100
@@ -4,45 +4,20 @@
#--------------------------defines
@@ -266,7 +264,7 @@
ifeq ($(OS),unix)
- MAINDIR = ../$(TKDIR)/unix
-+ MAINDIR = ../
++ MAINDIR = ../$(TKDIR)/unix
MAIN = tkAppInit
LIBS = ../lib/libsaotk.a \
@@ -299,17 +297,7 @@
endif
ifeq ($(OS),windows)
-@@ -113,21 +88,17 @@
- endif
-
- OBJS = ds9.o $(MAIN).o $(RES)
--CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
--CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
-+CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE) -DLIBDIR=\"${LIBDIR}\"
-+CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE) -DLIBDIR=\"${LIBDIR}\"
-
- #--------------------------targets
-
+@@ -121,13 +96,9 @@
ifeq ($(OS),unix)
all: ds9
@@ -345,9 +333,9 @@
#--------------------------solaris
ifeq ($(ARCH),solaris)
-diff -ur saods9.orig/htmlwidget/configure saods9/htmlwidget/configure
---- saods9.orig/htmlwidget/configure 2006-05-01 19:47:09.000000000 +0200
-+++ saods9/htmlwidget/configure 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/htmlwidget/configure saods9.new/htmlwidget/configure
+--- saods9/htmlwidget/configure 2006-05-01 19:47:09.000000000 +0200
++++ saods9.new/htmlwidget/configure 2007-12-08 16:36:40.000000000 +0100
@@ -1052,11 +1052,11 @@
echo "$ac_t""$BUILD_TCLSH" 1>&6
else
@@ -382,9 +370,9 @@
fi
CC=$TARGET_CC
echo $ac_n "checking for sin""... $ac_c" 1>&6
-diff -ur saods9.orig/Makefile saods9/Makefile
---- saods9.orig/Makefile 2007-10-10 18:35:24.000000000 +0200
-+++ saods9/Makefile 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/Makefile saods9.new/Makefile
+--- saods9/Makefile 2007-10-10 18:35:24.000000000 +0200
++++ saods9.new/Makefile 2007-12-08 16:36:40.000000000 +0100
@@ -43,8 +43,8 @@
XPAFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
$(XFLAGS)
@@ -617,9 +605,9 @@
#--------------------------cvs
-diff -ur saods9.orig/saotk/fitsy++/Makefile saods9/saotk/fitsy++/Makefile
---- saods9.orig/saotk/fitsy++/Makefile 2007-04-19 00:28:04.000000000 +0200
-+++ saods9/saotk/fitsy++/Makefile 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/saotk/fitsy++/Makefile saods9.new/saotk/fitsy++/Makefile
+--- saods9/saotk/fitsy++/Makefile 2007-04-19 00:28:04.000000000 +0200
++++ saods9.new/saotk/fitsy++/Makefile 2007-12-08 16:36:40.000000000 +0100
@@ -3,8 +3,8 @@
CXXFLAGS = $(CXXOPT) -I. -I.. -I../vector -I../util \
@@ -631,9 +619,9 @@
SS = \
alloc.C \
-diff -ur saods9.orig/saotk/frame/fitsimage.C saods9/saotk/frame/fitsimage.C
---- saods9.orig/saotk/frame/fitsimage.C 2007-05-22 20:36:50.000000000 +0200
-+++ saods9/saotk/frame/fitsimage.C 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/saotk/frame/fitsimage.C saods9.new/saotk/frame/fitsimage.C
+--- saods9/saotk/frame/fitsimage.C 2007-05-22 20:36:50.000000000 +0200
++++ saods9.new/saotk/frame/fitsimage.C 2007-12-08 16:36:40.000000000 +0100
@@ -31,7 +31,99 @@
// this is kluge to speed up doug minks wcssubs 'ksearch' routine
extern "C" {
@@ -735,9 +723,9 @@
char* findit(char* cards, char* key)
{
-diff -ur saods9.orig/saotk/frame/fitsimage.h saods9/saotk/frame/fitsimage.h
---- saods9.orig/saotk/frame/fitsimage.h 2007-05-18 22:06:56.000000000 +0200
-+++ saods9/saotk/frame/fitsimage.h 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/saotk/frame/fitsimage.h saods9.new/saotk/frame/fitsimage.h
+--- saods9/saotk/frame/fitsimage.h 2007-05-18 22:06:56.000000000 +0200
++++ saods9.new/saotk/frame/fitsimage.h 2007-12-08 16:36:40.000000000 +0100
@@ -9,7 +9,7 @@
#include "fitsdata.h"
#include "coord.h"
@@ -747,9 +735,9 @@
class FrameBase;
-diff -ur saods9.orig/saotk/frame/Makefile saods9/saotk/frame/Makefile
---- saods9.orig/saotk/frame/Makefile 2007-03-16 22:34:32.000000000 +0100
-+++ saods9/saotk/frame/Makefile 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/saotk/frame/Makefile saods9.new/saotk/frame/Makefile
+--- saods9/saotk/frame/Makefile 2007-03-16 22:34:32.000000000 +0100
++++ saods9.new/saotk/frame/Makefile 2007-12-08 16:36:40.000000000 +0100
@@ -4,7 +4,7 @@
CXXFLAGS = $(CXXOPT) -w \
-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
@@ -759,9 +747,9 @@
-I../../$(ASTDIR)
SS = \
-diff -ur saods9.orig/saotk/Makefile saods9/saotk/Makefile
---- saods9.orig/saotk/Makefile 2007-04-19 00:28:04.000000000 +0200
-+++ saods9/saotk/Makefile 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/saotk/Makefile saods9.new/saotk/Makefile
+--- saods9/saotk/Makefile 2007-04-19 00:28:04.000000000 +0200
++++ saods9.new/saotk/Makefile 2007-12-08 16:36:40.000000000 +0100
@@ -19,15 +19,10 @@
list/*.o \
fitsy++/*.o \
@@ -779,9 +767,9 @@
LIB = libsaotk.a
SHARED = libsaotk.so
-diff -ur saods9.orig/saotk/util/tkpostscript.h saods9/saotk/util/tkpostscript.h
---- saods9.orig/saotk/util/tkpostscript.h 2007-01-08 22:14:08.000000000 +0100
-+++ saods9/saotk/util/tkpostscript.h 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/saotk/util/tkpostscript.h saods9.new/saotk/util/tkpostscript.h
+--- saods9/saotk/util/tkpostscript.h 2007-01-08 22:14:08.000000000 +0100
++++ saods9.new/saotk/util/tkpostscript.h 2007-12-08 16:36:40.000000000 +0100
@@ -4,7 +4,7 @@
// this is copied from tkCanvPs.c
@@ -791,9 +779,9 @@
typedef struct TkPostscriptInfo {
int x, y, width, height; /* Area to print, in canvas pixel
-diff -ur saods9.orig/saotk/widget/ps.h saods9/saotk/widget/ps.h
---- saods9.orig/saotk/widget/ps.h 2007-01-08 22:14:08.000000000 +0100
-+++ saods9/saotk/widget/ps.h 2007-12-04 10:19:19.000000000 +0100
+diff -ur saods9/saotk/widget/ps.h saods9.new/saotk/widget/ps.h
+--- saods9/saotk/widget/ps.h 2007-01-08 22:14:08.000000000 +0100
++++ saods9.new/saotk/widget/ps.h 2007-12-08 16:36:40.000000000 +0100
@@ -13,7 +13,7 @@
#include "zlib.h"
extern int DebugGZ;
@@ -803,10 +791,10 @@
#define BIT32 int
#else
#define BIT32 long
-diff -ur saods9.orig/src/ds9.tcl saods9/src/ds9.tcl
---- saods9.orig/src/ds9.tcl 2007-10-02 23:46:26.000000000 +0200
-+++ saods9/src/ds9.tcl 2007-12-04 10:23:06.000000000 +0100
-@@ -62,19 +62,19 @@
+diff -ur saods9/src/ds9.tcl saods9.new/src/ds9.tcl
+--- saods9/src/ds9.tcl 2007-10-02 23:46:26.000000000 +0200
++++ saods9.new/src/ds9.tcl 2007-12-08 16:39:56.000000000 +0100
+@@ -62,19 +62,30 @@
set env(XPA_VERBOSITY) 0
# initialize, depending on how we are running: choices are zvfs, or wish
@@ -832,8 +820,19 @@
+ package require ftp
+ package require textutil::repeat
+ package require textutil::tabify
-+ source $blt_library/graph.tcl
-+ source $blt_library/tabset.tcl
++
++ package require BLT
++ package require Tktable
++ package require tclxpa
++ package require img::base
++ package require img::jpeg
++ package require img::tiff
++ package require img::png
++ package require img::gif
++ package require img::ppm
++ package require img::bmp
++ package require img::xbm
++ package require img::window
source $ds9(root)/src/source.tcl
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-8/ds9.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9.spec 4 Dec 2007 11:02:00 -0000 1.1
+++ ds9.spec 8 Dec 2007 23:30:57 -0000 1.2
@@ -1,6 +1,6 @@
Name: ds9
Version: 5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
@@ -22,12 +22,15 @@
Patch1: ds9-flex.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: zlib-devel libwcs-devel funtools-devel
+BuildRequires: zlib-devel funtools-devel
BuildRequires: blt-devel tcl-devel tk-devel
+
+# This package is required for etags
BuildRequires: emacs-common
BuildRequires: desktop-file-utils
-Requires: tcllib tktable tkimg xpa-libs
+# Change this
+Requires: tcllib tktable tkimg xpa-tcl
%description
SAOImage DS9 is an astronomical imaging and data visualization application.
@@ -41,19 +44,6 @@
%{__cp} %{SOURCE3} saotk/util
%patch0 -p1
%patch1 -p1
-# To be sure we are using the native libs
-%{__rm} -rf zlib-*
-%{__rm} -rf xpa-*
-%{__rm} -rf wcssubs-*
-%{__rm} -rf funtools-*
-%{__rm} -rf tktable*
-%{__rm} -rf tcllib-*
-%{__rm} -rf blt*
-%{__rm} -rf tcl8.4.14
-%{__cp} tk8.4.14/unix/tkAppInit.c .
-%{__rm} -rf tk8.4.14
-%{__rm} -rf tkimg*
-%{__rm} -rf zip-*
%build
%{__cp} %{SOURCE2} make.include
@@ -97,6 +87,9 @@
%changelog
+* Sat Dec 08 2007 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-6
+- Fixed problems with TCL package loading
+
* Tue Dec 04 2007 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-5
- Reverting tcllib patch, using package require instead
More information about the fedora-extras-commits
mailing list