rpms/ds9/F-9 ds9-tkcon.patch, NONE, 1.1 ds9.README.fedora, NONE, 1.1 ds9-gcc43.patch, 1.2, 1.3 ds9-main.patch, 1.1, 1.2 ds9-mastermake.patch, 1.1, 1.2 ds9-saotk.patch, 1.1, 1.2 ds9-src.patch, 1.1, 1.2 ds9.spec, 1.10, 1.11 sources, 1.3, 1.4
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Fri May 30 08:43:52 UTC 2008
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19924
Modified Files:
ds9-gcc43.patch ds9-main.patch ds9-mastermake.patch
ds9-saotk.patch ds9-src.patch ds9.spec sources
Added Files:
ds9-tkcon.patch ds9.README.fedora
Log Message:
* Fri May 30 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-2
- Updated gcc 4.3 patch
* Fri May 30 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-1
- New upstream source
ds9-tkcon.patch:
--- NEW FILE ds9-tkcon.patch ---
diff -ur saods9/src/ds9.tcl saods9.tkcon/src/ds9.tcl
--- saods9/src/ds9.tcl 2008-05-30 09:11:53.000000000 +0200
+++ saods9.tkcon/src/ds9.tcl 2008-05-30 09:13:57.000000000 +0200
@@ -82,7 +82,7 @@
package require textutil::repeat
package require textutil::tabify
- package require tkcon
+# package require tkcon
package require BLT
package require Tktable
diff -ur saods9/src/mfile.tcl saods9.tkcon/src/mfile.tcl
--- saods9/src/mfile.tcl 2008-04-01 23:41:09.000000000 +0200
+++ saods9.tkcon/src/mfile.tcl 2008-05-30 09:13:24.000000000 +0200
@@ -40,7 +40,7 @@
$ds9(mb).file add separator
$ds9(mb).file add command -label "[msgcat::mc {XPA Information}]..." \
-command DisplayXPAInfo
- $ds9(mb).file add command -label "[msgcat::mc {Open TCL Console}]..." \
+# $ds9(mb).file add command -label "[msgcat::mc {Open TCL Console}]..." \
-command OpenConsole
$ds9(mb).file add command -label "[msgcat::mc {Source TCL}]..." \
-command OpenSource
@@ -238,7 +238,7 @@
$m add separator
$m add checkbutton -label "[msgcat::mc {XPA Information}]..." \
-variable buttons(file,xpa) -command {UpdateButtons buttons(file)}
- $m add checkbutton -label "[msgcat::mc {Open TCL Console}]..." \
+# $m add checkbutton -label "[msgcat::mc {Open TCL Console}]..." \
-variable buttons(file,console) -command {UpdateButtons buttons(file)}
$m add checkbutton -label "[msgcat::mc {Source TCL}]..." \
-variable buttons(file,tcl) -command {UpdateButtons buttons(file)}
--- NEW FILE ds9.README.fedora ---
Version 5.2 of fedora ds9 doesn't include tkcon. Version 2.5 of tkcon is required and only 2.4 is iiiincluded currently in fedora
ds9-gcc43.patch:
Index: ds9-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-gcc43.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds9-gcc43.patch 21 Feb 2008 17:30:59 -0000 1.2
+++ ds9-gcc43.patch 30 May 2008 08:43:05 -0000 1.3
@@ -289,3 +289,12 @@
Filter::Filter()
{
+diff -ur saods9/saotk/util/conputs.C saods9.new/saotk/util/conputs.C
+--- saods9/saotk/util/conputs.C 2008-03-25 23:15:47.000000000 +0100
++++ saods9.new/saotk/util/conputs.C 2008-05-16 15:25:03.000000000 +0200
+@@ -1,4 +1,5 @@
+ #include <iostream>
++#include <cstring>
+ using namespace std;
+
+ #include <tcl.h>
ds9-main.patch:
Index: ds9-main.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-main.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-main.patch 12 Jan 2008 00:32:58 -0000 1.1
+++ ds9-main.patch 30 May 2008 08:43:05 -0000 1.2
@@ -1,7 +1,99 @@
+diff -ur saods9/ds9/Makefile saods9.new/ds9/Makefile
+--- saods9/ds9/Makefile 2008-03-27 23:25:36.000000000 +0100
++++ saods9.new/ds9/Makefile 2008-05-09 16:31:55.000000000 +0200
+@@ -4,12 +4,7 @@
+ #--------------------------defines
+
+ ZDIR = zipdir/zvfsmntpt
+-FILES = $(ZDIR)/$(TCLVER) \
+- $(ZDIR)/$(TKVER) \
+- $(ZDIR)/$(BLTVER) \
+- $(ZDIR)/$(TCLLIBVER) \
+- $(ZDIR)/$(TKCONVER) \
+- $(ZDIR)/src \
++FILES = $(ZDIR)/src \
+ $(ZDIR)/msgs \
+ $(ZDIR)/doc \
+ $(ZDIR)/template
+@@ -22,37 +17,14 @@
+ ../lib/libsaotk.a \
+ ../lib/libtkhtml.a \
+ ../lib/libtkmpeg.a \
+- ../lib/$(TKIMGVER)/libtkimgwindow1.3.a \
+- ../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \
+- ../lib/$(TKIMGVER)/libjpegtcl1.0.a \
+- ../lib/$(TKIMGVER)/libtkimgtiff1.3.a \
+- ../lib/$(TKIMGVER)/libtifftcl3.6.1.a \
+- ../lib/$(TKIMGVER)/libtkimgpng1.3.a \
+- ../lib/$(TKIMGVER)/libpngtcl1.2.6.a \
+- ../lib/$(TKIMGVER)/libtkimgppm1.3.a \
+- ../lib/$(TKIMGVER)/libtkimggif1.3.a \
+- ../lib/$(TKIMGVER)/libtkimgbmp1.3.a \
+- ../lib/$(TKIMGVER)/libtkimgxbm1.3.a \
+- ../lib/$(TKIMGVER)/libzlibtcl1.2.1.a \
+- ../lib/$(TKIMGVER)/libtkimg1.3.a \
+- ../lib/$(TKTABLEVER)/libTktable2.9.a \
+- ../lib/libfuntools.a \
+ ../lib/librice.a \
+ ../lib/libhcomp.a \
+ ../lib/libplio.a \
+ ../lib/libast.a \
+ ../lib/libsaotk.a \
+- ../lib/libwcs.a \
+ ../lib/libsla.a \
+- ../lib/libzvfs.a \
+- ../lib/libzip.a \
+- ../lib/libz.a \
+- ../lib/libxpa.a \
+ ../lib/libiis.a \
+- ../lib/libcheckdns.a \
+- ../lib/libBLT24.a \
+- ../lib/libtk8.4.a \
+- ../lib/libtcl8.4.a
++ ../lib/libcheckdns.a
+ endif
+
+ ifeq ($(OS),windows)
+@@ -149,13 +121,9 @@
+ ifeq ($(OS),unix)
+ all: ds9
+
+-ds9 : null.zip ds9Base $(FILES)
++ds9 : ds9Base $(FILES)
+ $(RM) $@
+- cp ds9Base ds9.zip
+- $(STRIP) ds9.zip
+- cat null.zip >> ds9.zip
+- cd zipdir; zip -rA9 ../ds9.zip *
+- mv ds9.zip ds9
++ cp ds9Base ds9
+ cp ds9 ../bin/.
+
+ debug : null.zip ds9Base $(FILES)
+@@ -344,6 +312,19 @@
+ rm -f libstdc++.a
+ endif
+
++# For fedora
++ifeq ($(ARCH),fedora)
++ds9Base : $(OBJS) $(LIBS)
++ $(RM) $@
++ $(CXX) ${OPTS} \
++ -o $@ $(OBJS) $(LIBS)\
++ -L$(X11LIB) -lX11 \
++ -ldl -lpthread \
++ -ltk -ltcl -L${LIBDIR}/blt2.4 -lBLT24 \
++ -lfuntools -lwcs -lz
++endif
++
++
+ #--------------------------linux
+
+ ifneq (,$(findstring linux,$(ARCH)))
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 @@
+--- saods9/ds9/ds9.C 2008-05-09 16:59:50.000000000 +0200
++++ saods9.new/ds9/ds9.C 2008-05-09 16:57:32.000000000 +0200
+@@ -11,8 +11,8 @@
void TclSetStartupScriptFileName(const char*);
@@ -12,7 +104,7 @@
int Blt_Init(Tcl_Interp*);
int Tktable_Init(Tcl_Interp*);
-@@ -57,16 +57,16 @@
+@@ -64,15 +64,15 @@
appname = dupstr(argv[0]);
// set default encoding dir
@@ -26,14 +118,13 @@
+// putenv("TCL_LIBRARY=./zvfsmntpt/tcl8.4");
+// putenv("TK_LIBRARY=./zvfsmntpt/tk8.4");
- // trap for -console, else set our startup script
- if (argc<2 || strcmp(argv[1],"-console"))
-- TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
-+ TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl");
- else
- console =1;
+ // invoke startup script
+- TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
++ TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl");
}
-@@ -82,20 +82,20 @@
+
+ Tcl_Interp *global_interp;
+@@ -91,13 +91,13 @@
// We have to initialize the virtual filesystem before calling
// Tcl_Init(). Otherwise, Tcl_Init() will not be able to find
// its startup script files.
@@ -41,35 +132,31 @@
+/* if (Zvfs_Init(interp) == TCL_ERROR)
return TCL_ERROR;
Tcl_StaticPackage (interp, "zvfs", Zvfs_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-
+ (Tcl_PackageInitProc*)NULL);
+-
++*/
// find current working directory, and set as mount point
- {
+/* {
Tcl_DString pwd;
Tcl_DStringInit(&pwd);
Tcl_GetCwd(interp, &pwd);
- Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(),
+@@ -105,7 +105,7 @@
Tcl_DStringValue(&pwd));
Tcl_DStringFree(&pwd);
-- }
-+ }*/
-
+ }
+-
++*/
// Initialize Tcl and Tk
if (Tcl_Init(interp))
-@@ -104,7 +104,7 @@
+ return TCL_ERROR;
+@@ -113,19 +113,19 @@
// Tk
if (Tk_Init(interp))
return TCL_ERROR;
- Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
+// Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
- #ifdef __WIN32__
- if (console) {
-@@ -115,16 +115,18 @@
- #endif
-
// Blt
- if (Blt_Init(interp) == TCL_ERROR)
+/* if (Blt_Init(interp) == TCL_ERROR)
@@ -78,19 +165,17 @@
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "BLT", "2.4", 0);
// Tktable
- if (Tktable_Init(interp) == TCL_ERROR)
-+ /*if (Tktable_Init(interp) == TCL_ERROR)
++/* if (Tktable_Init(interp) == TCL_ERROR)
return TCL_ERROR;
Tcl_StaticPackage (interp, "Tktable", Tktable_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "Tktable", "2.9", 0);
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
-@@ -145,10 +147,12 @@
+@@ -146,10 +146,10 @@
(Tcl_PackageInitProc*)NULL);
// Tclxpa
@@ -100,237 +185,38 @@
Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+
-+ //Tcl_PkgRequire(interp, "Tclxpa", "1.0", 0);
// IIS
if (Iis_Init(interp) == TCL_ERROR)
-@@ -163,82 +167,95 @@
+@@ -164,7 +164,7 @@
(Tcl_PackageInitProc*)NULL);
// Tkimg
- if (Tkimg_Init(interp) == TCL_ERROR)
-+ /*if (Tkimg_Init(interp) == TCL_ERROR)
++/* if (Tkimg_Init(interp) == TCL_ERROR)
return TCL_ERROR;
Tcl_StaticPackage (interp, "img",
-- Tkimg_Init,(Tcl_PackageInitProc*)NULL);
-+ Tkimg_Init,(Tcl_PackageInitProc*)NULL);*/
-+
-+ //Tcl_PkgRequire(interp, "img", "1.3", 0);
-
- // zlibtcl
-- if (Zlibtcl_Init(interp) == TCL_ERROR)
-+/* if (Zlibtcl_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "zlibtcl", "1.2", 0);
-
- // jpegtcl
-- if (Jpegtcl_Init(interp) == TCL_ERROR)
-+ /*if (Jpegtcl_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "jpegtcl", "1.0", 0);
-
- // Tkimgjpeg
-- if (Tkimgjpeg_Init(interp) == TCL_ERROR)
-+/* if (Tkimgjpeg_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "jpeg", "1.3", 0);
-
- // Tifftcl
-- if (Tifftcl_Init(interp) == TCL_ERROR)
-+/* if (Tifftcl_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "tifftcl", "3.8.2", 0);
-
- // Tkimgtiff
-- if (Tkimgtiff_Init(interp) == TCL_ERROR)
-+/* if (Tkimgtiff_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "tiff", "1.3", 0);
-
- // Pngtcl
-- if (Pngtcl_Init(interp) == TCL_ERROR)
-+/* if (Pngtcl_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "pngtcl", "1.2.12", 0);
-
- // Tkimgpng
-- if (Tkimgpng_Init(interp) == TCL_ERROR)
-+/* if (Tkimgpng_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "png", Tkimgpng_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "png", "1.3", 0);
-
- // Tkimggif
-- if (Tkimggif_Init(interp) == TCL_ERROR)
-+/* if (Tkimggif_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "gif", Tkimggif_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "gif", "1.3", 0);
-
- // Tkimgppm
-- if (Tkimgppm_Init(interp) == TCL_ERROR)
-+/* if (Tkimgppm_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "ppm", Tkimgppm_Init,
-- (Tcl_PackageInitProc*)NULL);
--
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "ppm", "1.3", 0);
- // Tkimgbmp
-- if (Tkimgbmp_Init(interp) == TCL_ERROR)
-+/* if (Tkimgbmp_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "bmp", Tkimgbmp_Init,
-- (Tcl_PackageInitProc*)NULL);
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "bpm", "1.3", 0);
-+ // Tkimgbmp
-
- // Tkimgxbm
-- if (Tkimgxbm_Init(interp) == TCL_ERROR)
-+/* if (Tkimgxbm_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "xbm", Tkimgxbm_Init,
-- (Tcl_PackageInitProc*)NULL);
--
-+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "bpm", "1.3", 0);
- // Tkimgwindow
-- if (Tkimgwindow_Init(interp) == TCL_ERROR)
-+ /*if (Tkimgwindow_Init(interp) == TCL_ERROR)
+ Tkimg_Init,(Tcl_PackageInitProc*)NULL);
+@@ -239,7 +239,7 @@
+ if (Tkimgwindow_Init(interp) == TCL_ERROR)
return TCL_ERROR;
Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
- (Tcl_PackageInitProc*)NULL);
+ (Tcl_PackageInitProc*)NULL);*/
-+ //Tcl_PkgRequire(interp, "window", "1.3", 0);
#ifdef _MACOSX
if (Tkmacosx_Init(interp) == TCL_ERROR)
-@@ -248,11 +265,12 @@
+@@ -256,11 +256,11 @@
#endif
// 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, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", 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_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, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY);
-diff -ur saods9/ds9/Makefile saods9.new/ds9/Makefile
---- saods9/ds9/Makefile 2007-12-28 23:07:11.000000000 +0100
-+++ saods9.new/ds9/Makefile 2008-01-11 14:21:26.000000000 +0100
-@@ -4,11 +4,7 @@
- #--------------------------defines
-
- ZDIR = zipdir/zvfsmntpt
--FILES = $(ZDIR)/$(TCLVER) \
-- $(ZDIR)/$(TKVER) \
-- $(ZDIR)/$(BLTVER) \
-- $(ZDIR)/$(TCLLIBVER) \
-- $(ZDIR)/src \
-+FILES = $(ZDIR)/src \
- $(ZDIR)/msgs \
- $(ZDIR)/doc \
- $(ZDIR)/template
-@@ -21,37 +17,14 @@
- ../lib/libsaotk.a \
- ../lib/libtkhtml.a \
- ../lib/libtkmpeg.a \
-- ../lib/$(TKIMGVER)/libtkimgwindow1.3.a \
-- ../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \
-- ../lib/$(TKIMGVER)/libjpegtcl1.0.a \
-- ../lib/$(TKIMGVER)/libtkimgtiff1.3.a \
-- ../lib/$(TKIMGVER)/libtifftcl3.6.1.a \
-- ../lib/$(TKIMGVER)/libtkimgpng1.3.a \
-- ../lib/$(TKIMGVER)/libpngtcl1.2.6.a \
-- ../lib/$(TKIMGVER)/libtkimgppm1.3.a \
-- ../lib/$(TKIMGVER)/libtkimggif1.3.a \
-- ../lib/$(TKIMGVER)/libtkimgbmp1.3.a \
-- ../lib/$(TKIMGVER)/libtkimgxbm1.3.a \
-- ../lib/$(TKIMGVER)/libzlibtcl1.2.1.a \
-- ../lib/$(TKIMGVER)/libtkimg1.3.a \
-- ../lib/$(TKTABLEVER)/libTktable2.9.a \
-- ../lib/libfuntools.a \
- ../lib/librice.a \
- ../lib/libhcomp.a \
- ../lib/libplio.a \
- ../lib/libast.a \
- ../lib/libsaotk.a \
-- ../lib/libwcs.a \
- ../lib/libsla.a \
-- ../lib/libzvfs.a \
-- ../lib/libzip.a \
-- ../lib/libz.a \
-- ../lib/libxpa.a \
- ../lib/libiis.a \
-- ../lib/libcheckdns.a \
-- ../lib/libBLT24.a \
-- ../lib/libtk8.4.a \
-- ../lib/libtcl8.4.a
-+ ../lib/libcheckdns.a
- endif
-
- ifeq ($(OS),windows)
-@@ -148,13 +121,9 @@
- ifeq ($(OS),unix)
- all: ds9
-
--ds9 : null.zip ds9Base $(FILES)
-+ds9 : ds9Base $(FILES)
- $(RM) $@
-- cp ds9Base ds9.zip
-- $(STRIP) ds9.zip
-- cat null.zip >> ds9.zip
-- cd zipdir; zip -rA9 ../ds9.zip *
-- mv ds9.zip ds9
-+ cp ds9Base ds9
- cp ds9 ../bin/.
-
- debug : null.zip ds9Base $(FILES)
-@@ -339,6 +308,18 @@
- rm -f libstdc++.a
- endif
-
-+# For fedora
-+ifeq ($(ARCH),fedora)
-+ds9Base : $(OBJS) $(LIBS)
-+ $(RM) $@
-+ $(CXX) ${OPTS} \
-+ -o $@ $(OBJS) $(LIBS)\
-+ -L$(X11LIB) -lX11 \
-+ -ldl -lpthread \
-+ -ltk -ltcl -L${LIBDIR}/blt2.4 -lBLT24 \
-+ -lfuntools -lwcs -lz
-+endif
-+
- #--------------------------linux
-
- ifneq (,$(findstring linux,$(ARCH)))
ds9-mastermake.patch:
Index: ds9-mastermake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-mastermake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-mastermake.patch 12 Jan 2008 00:32:58 -0000 1.1
+++ ds9-mastermake.patch 30 May 2008 08:43:05 -0000 1.2
@@ -1,6 +1,6 @@
diff -ur saods9/Makefile saods9.new/Makefile
---- saods9/Makefile 2007-12-06 22:44:17.000000000 +0100
-+++ saods9.new/Makefile 2008-01-08 12:09:11.000000000 +0100
+--- saods9/Makefile 2008-05-09 16:25:29.000000000 +0200
++++ saods9.new/Makefile 2008-05-09 16:28:44.000000000 +0200
@@ -35,8 +35,8 @@
--with-tk=$(root)/$(TKDIRDIR) $(XFLAGS)
XPAFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
@@ -12,33 +12,36 @@
FUNTOOLSFLAGS = --prefix $(root) --with-zlib=../../lib/libz.a \
--with-wcslib=../lib/libwcs.a --enable-mainlib
endif
-@@ -232,44 +232,28 @@
+@@ -235,50 +235,24 @@
@for d in $(DIRS); do if [ ! -d $$d ]; then mkdir $$d; fi done
tcl : FORCE
- @echo "Installing Tcl..."
- cd $(TCLDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared
- cd $(TCLDIRDIR); $(MAKE) install
-+ @echo "Using native Tcl..."
tk : FORCE
- @echo "Installing Tk..."
- cd $(TKDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared
- cd $(TKDIRDIR); $(MAKE) install
- $(RM) -r lib/$(TKVER)/demos
-+ @echo "Using native Tk..."
tktable : FORCE
- @echo "Installing TkTable..."
- cd $(TKTABLEDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKTABLEFLAGS) --disable-shared
- cd $(TKTABLEDIR); $(MAKE); $(MAKE) install
-+ @echo "Using native TkTable..."
tcllib : FORCE
-- @echo "Installing TCLLIB..."
+- @echo "Installing TclLib..."
- cd $(TCLLIBDIR); ./configure $(TCLLIBFLAGS)
- cd $(TCLLIBDIR); $(MAKE) install
+ tkcon : FORCE
+- @echo "Installing TkCon..."
+- $(RM) -r lib/$(TKCONVER)
+- mkdir lib/$(TKCONVER)
+- cp $(TKCONDIR)/*.tcl lib/$(TKCONVER)
+
ifeq ($(OS),macosx)
blt : optincl
else
@@ -47,23 +50,20 @@
- @echo "Installing BLT..."
- cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(BLTFLAGS)
- cd $(BLTDIR); $(MAKE); $(MAKE) install
-+ @echo "Using native BLT..."
zlib : FORCE
- @echo "Installing zlib..."
- cd $(ZLIBDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(ZLIBFLAGS)
- cd $(ZLIBDIR); $(MAKE) install
-+ @echo "Using native zlib..."
tkimg : FORCE
- @echo "Installing TKIMG..."
- cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKIMGFLAGS) --disable-shared
- cd $(TKIMGDIR); $(MAKE) install
-+ @echo "Using native tkimg..."
tkmpeg : FORCE
@echo "Installing TKMPEG..."
-@@ -278,15 +262,12 @@
+@@ -287,15 +261,11 @@
html : FORCE
@echo "Installing HTMLWIDGET..."
@@ -77,11 +77,10 @@
- cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(OPTS) $(LIBS)' ./configure $(XPAFLAGS) --disable-shared
- cd $(XPADIR); $(MAKE); $(MAKE) install
- cd bin; $(STRIP) xpa*
-+ @echo "Using native xpa..."
iis : FORCE
@echo "Installing IIS..."
-@@ -297,18 +278,14 @@
+@@ -306,18 +276,12 @@
cd $(CHECKDNSDIR); $(MAKE) install
funtools: FORCE
@@ -89,7 +88,6 @@
- cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(FUNTOOLSFLAGS)
- cd $(FUNTOOLSDIR); $(MAKE) lib
- cp $(FUNTOOLSDIR)/libfuntools.a lib/.
-+ @echo "Using native funtools..."
ast : FORCE
@echo "Installing AST..."
@@ -98,11 +96,10 @@
wcssubs : FORCE
- @echo "Installing WCSSUBS..."
- cd $(WCSSUBSDIR); $(MAKE) install
-+ @echo "Using native wcs..."
sla : FORCE
@echo "Installint SLA..."
-@@ -337,17 +314,10 @@
+@@ -350,17 +314,8 @@
endif
zip : FORCE
@@ -112,13 +109,75 @@
- cd $(ZIPDIR); $(RM) libzip.a
- cd $(ZIPDIR); $(AR) -cr libzip.a $(ZIPOBJS)
- cp $(ZIPDIR)/libzip.a lib/.
-+ @echo "ZIP not needed..."
zvfs : FORCE
- @echo "Installing ZVFS..."
- cd $(ZVFSDIR); $(MAKE)
- cd $(ZVFSDIR); $(MAKE) install
-+ @echo "ZVFS not needed..."
#--------------------------clean
+@@ -393,36 +348,26 @@
+ @for d in $(DIRS); do rm -rf $$d; done
+
+ tclclean : FORCE
+- cd $(TCLDIRDIR); $(MAKE) distclean
+
+ tkclean : FORCE
+- cd $(TKDIRDIR); $(MAKE) distclean
+
+ tktableclean: FORCE
+- cd $(TKTABLEDIR); $(MAKE) distclean
+
+ tcllibclean: FORCE
+- cd $(TCLLIBDIR); $(MAKE) distclean
+
+ bltclean: FORCE
+- cd $(BLTDIR); $(MAKE) distclean
+
+ tkimgclean: FORCE
+- rm -fr $(TKIMGDIR)/Img/*
+- rm -fr $(LIB)/Img1.3
+- cd $(TKIMGDIR); $(MAKE) distclean
+
+ tkmpegclean: FORCE
+ cd $(TKMPEGDIR); $(MAKE) distclean
+
+ zlibclean: FORCE
+- cd $(ZLIBDIR); $(MAKE) distclean
+
+ htmlclean: FORCE
+ cd $(HTMLDIR); $(MAKE) distclean
+
+ xpaclean : FORCE
+- cd $(XPADIR); $(MAKE) distclean
+
+ iisclean : FORCE
+ cd $(IISDIR); $(MAKE) distclean
+@@ -445,7 +390,6 @@
+ endif
+
+ funtoolsclean: FORCE
+- cd $(FUNTOOLSDIR); $(MAKE) distclean
+
+ slaclean: FORCE
+ cd $(SLADIR); $(MAKE) distclean
+@@ -454,7 +398,6 @@
+ cd $(ASTDIR); $(MAKE) distclean
+
+ wcssubsclean: FORCE
+- cd $(WCSSUBSDIR); $(MAKE) distclean
+
+ riceclean: FORCE
+ cd $(RICEDIR); $(MAKE) distclean
+@@ -466,10 +409,8 @@
+ cd $(PLIODIR); $(MAKE) distclean
+
+ zipclean: FORCE
+- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
+
+ zvfsclean: FORCE
+- cd $(ZVFSDIR); $(MAKE) distclean
+
+ #--------------------------cvs
+
ds9-saotk.patch:
Index: ds9-saotk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-saotk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-saotk.patch 12 Jan 2008 00:32:58 -0000 1.1
+++ ds9-saotk.patch 30 May 2008 08:43:05 -0000 1.2
@@ -1,18 +1,18 @@
diff -ur saods9/saotk/util/tkpostscript.h saods9.new/saotk/util/tkpostscript.h
---- saods9/saotk/util/tkpostscript.h 2007-11-27 19:43:00.000000000 +0100
-+++ saods9.new/saotk/util/tkpostscript.h 2008-01-08 12:02:07.000000000 +0100
+--- saods9/saotk/util/tkpostscript.h 2008-02-20 23:26:21.000000000 +0100
++++ saods9.new/saotk/util/tkpostscript.h 2008-05-09 16:05:20.000000000 +0200
@@ -4,7 +4,7 @@
// this is copied from tkCanvPs.c
--#include "../../tk8.4.17/generic/tkCanvas.h"
+-#include "../../tk8.4.18/generic/tkCanvas.h"
+#include <tk-private/generic/tkCanvas.h>
typedef struct TkPostscriptInfo {
int x, y, width, height; /* Area to print, in canvas pixel
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 2008-01-08 12:03:32.000000000 +0100
+--- saods9/saotk/widget/ps.h 2008-01-04 18:29:27.000000000 +0100
++++ saods9.new/saotk/widget/ps.h 2008-05-09 16:06:14.000000000 +0200
@@ -13,7 +13,7 @@
#include "zlib.h"
extern int DebugGZ;
ds9-src.patch:
Index: ds9-src.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-src.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-src.patch 12 Jan 2008 00:32:58 -0000 1.1
+++ ds9-src.patch 30 May 2008 08:43:05 -0000 1.2
@@ -1,10 +1,10 @@
diff -ur saods9/src/ds9.tcl saods9.new/src/ds9.tcl
---- saods9/src/ds9.tcl 2007-12-07 17:08:09.000000000 +0100
-+++ saods9.new/src/ds9.tcl 2008-01-08 11:58:35.000000000 +0100
-@@ -73,19 +73,30 @@
- set env(FILTER_PTYPE) c
-
+--- saods9/src/ds9.tcl 2008-04-09 17:35:48.000000000 +0200
++++ saods9.new/src/ds9.tcl 2008-05-09 16:13:55.000000000 +0200
+@@ -68,24 +68,34 @@
# initialize, depending on how we are running: choices are zvfs, or wish
+ # for now, its not possible to change the current work directory since
+ # all of the paths are relative
-if {![catch {package present zvfs}]} {
- set ds9(root) "zvfsmntpt"
+if {![catch {package present checkdns}]} {
@@ -15,19 +15,25 @@
+ package require msgcat
+ package require http
+- source $ds9(root)/tk8.4/tearoff.tcl
++
+
- source $ds9(root)/tcllib1.10/base64/base64.tcl
- source $ds9(root)/tcllib1.10/log/log.tcl
- source $ds9(root)/tcllib1.10/ftp/ftp.tcl
- source $ds9(root)/tcllib1.10/textutil/repeat.tcl
- source $ds9(root)/tcllib1.10/textutil/tabify.tcl
-- source $ds9(root)/blt2.4/graph.tcl
-- source $ds9(root)/blt2.4/tabset.tcl
+ package require base64
+ package require log
+ package require ftp
+ package require textutil::repeat
+ package require textutil::tabify
-+
+
+- source $ds9(root)/tkcon2.5/tkcon.tcl
++ package require tkcon
+
+- source $ds9(root)/blt2.4/graph.tcl
+- source $ds9(root)/blt2.4/tabset.tcl
+ package require BLT
+ package require Tktable
+ package require tclxpa
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ds9.spec 21 Feb 2008 17:30:59 -0000 1.10
+++ ds9.spec 30 May 2008 08:43:05 -0000 1.11
@@ -1,6 +1,6 @@
Name: ds9
-Version: 5.1
-Release: 4%{?dist}
+Version: 5.2
+Release: 2%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
@@ -9,6 +9,7 @@
Source0: http://hea-www.harvard.edu/RD/ds9/%{name}.%{version}.tar.gz
Source1: ds9.desktop
Source2: ds9.make.fedora
+Source3: ds9.README.fedora
Patch0: ds9-main.patch
Patch1: ds9-fitsy.patch
Patch2: ds9-frame.patch
@@ -18,11 +19,12 @@
Patch6: ds9-src.patch
Patch7: ds9-tcl85.patch
Patch8: ds9-gcc43.patch
+Patch9: ds9-tkcon.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: zlib-devel funtools-devel
-BuildRequires: blt-devel tcl-devel tk-devel
+BuildRequires: blt-devel tk-devel
# This package is required for etags
BuildRequires: emacs-common
@@ -48,12 +50,14 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
%{__cp} %{SOURCE2} make.include
echo LIBDIR="%{_libdir}" >> make.include
echo OPTS="%{optflags}" >> make.include
%{__make} %{_smp_mflags}
+%{__cp} %{SOURCE3} README.fedora
%install
%{__rm} -fr %{buildroot}
@@ -76,7 +80,7 @@
%{__rm} -fr %{buildroot}
%files
-%doc COPYING copyright
+%doc COPYING copyright README.fedora
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/applications/*
@@ -92,6 +96,12 @@
%changelog
+* Fri May 30 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-2
+- Updated gcc 4.3 patch
+
+* Fri May 30 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-1
+- New upstream source
+
* Thu Feb 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.1-4
- Patch to build with gcc 4.3 updated
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 Jan 2008 00:32:58 -0000 1.3
+++ sources 30 May 2008 08:43:05 -0000 1.4
@@ -1 +1 @@
-b835c11c87512d830d2bdccd27ca07f7 ds9.5.1.tar.gz
+67a552ec2ae5278e451a5f34b153a987 ds9.5.2.tar.gz
More information about the fedora-extras-commits
mailing list