rpms/ds9/F-9 ds9-frame.patch, 1.1, 1.2 ds9-gcc43.patch, 1.3, 1.4 ds9-main.patch, 1.2, 1.3 ds9-tcl85.patch, 1.2, 1.3 ds9.spec, 1.12, 1.13 sources, 1.4, 1.5

Sergio Pascual sergiopr at fedoraproject.org
Sat Nov 15 10:14:38 UTC 2008


Author: sergiopr

Update of /cvs/pkgs/rpms/ds9/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6670

Modified Files:
	ds9-frame.patch ds9-gcc43.patch ds9-main.patch ds9-tcl85.patch 
	ds9.spec sources 
Log Message:
* Thu Nov 13 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.4-1
- New upstream source


ds9-frame.patch:

Index: ds9-frame.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-frame.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-frame.patch	12 Jan 2008 00:32:58 -0000	1.1
+++ ds9-frame.patch	15 Nov 2008 10:14:06 -0000	1.2
@@ -102,18 +102,6 @@
  
    char* findit(char* cards, char* key)
    {
-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"
- #include "file.h"
--#include "wcs.h"
-+#include <wcs/wcs.h>
- 
- class FrameBase;
- 
 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
@@ -122,7 +110,7 @@
  	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
  	-I../../include -I$(X11INCLUDE) \
 -	-I../../$(FUNTOOLSDIR)/util \
-+	-I/usr/include/funtools/util -I/usr/include/blt\
++	-I/usr/include/funtools/util -I/usr/include/blt -I/usr/include/wcs\
  	-I../../$(ASTDIR)
  
  SS	= \

ds9-gcc43.patch:

Index: ds9-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-gcc43.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds9-gcc43.patch	30 May 2008 08:43:05 -0000	1.3
+++ ds9-gcc43.patch	15 Nov 2008 10:14:06 -0000	1.4
@@ -1,15 +1,16 @@
-diff -ur saods9/ds9/ds9.C saods9.gcc43/ds9/ds9.C
---- saods9/ds9/ds9.C	2007-06-19 19:13:04.000000000 +0200
-+++ saods9.gcc43/ds9/ds9.C	2008-02-21 15:45:02.000000000 +0100
-@@ -1,4 +1,5 @@
+diff -ur saods9/ds9/ds9.C saods9.new/ds9/ds9.C
+--- saods9/ds9/ds9.C	2008-11-13 12:03:20.000000000 +0100
++++ saods9.new/ds9/ds9.C	2008-11-13 11:53:11.000000000 +0100
+@@ -1,5 +1,6 @@
  #include <iostream>
+ #include <sstream>
 +#include <cstring>
  using namespace std;
  
  #include <tcl.h>
-diff -ur saods9/iis/iistcl.C saods9.gcc43/iis/iistcl.C
---- saods9/iis/iistcl.C	2008-01-04 18:24:23.000000000 +0100
-+++ saods9.gcc43/iis/iistcl.C	2008-02-21 11:03:11.000000000 +0100
+diff -ur saods9/iis/iistcl.C saods9.new/iis/iistcl.C
+--- saods9/iis/iistcl.C	2008-06-02 23:27:50.000000000 +0200
++++ saods9.new/iis/iistcl.C	2008-11-13 11:53:38.000000000 +0100
 @@ -7,6 +7,7 @@
  
  #include <iostream>
@@ -18,9 +19,9 @@
  using namespace std;
  
  #include <tcl.h>
-diff -ur saods9/saotk/fitsy++/card.C saods9.gcc43/saotk/fitsy++/card.C
+diff -ur saods9/saotk/fitsy++/card.C saods9.new/saotk/fitsy++/card.C
 --- saods9/saotk/fitsy++/card.C	2008-01-04 18:29:24.000000000 +0100
-+++ saods9.gcc43/saotk/fitsy++/card.C	2008-02-21 12:37:49.000000000 +0100
++++ saods9.new/saotk/fitsy++/card.C	2008-11-13 11:54:15.000000000 +0100
 @@ -3,6 +3,7 @@
  // For conditions of distribution and use, see copyright notice in "copyright"
  
@@ -29,9 +30,9 @@
  
  FitsCard::FitsCard()
  {
-diff -ur saods9/saotk/fitsy++/compress.C saods9.gcc43/saotk/fitsy++/compress.C
---- saods9/saotk/fitsy++/compress.C	2008-01-04 18:29:24.000000000 +0100
-+++ saods9.gcc43/saotk/fitsy++/compress.C	2008-02-21 12:37:22.000000000 +0100
+diff -ur saods9/saotk/fitsy++/compress.C saods9.new/saotk/fitsy++/compress.C
+--- saods9/saotk/fitsy++/compress.C	2008-06-05 22:37:51.000000000 +0200
++++ saods9.new/saotk/fitsy++/compress.C	2008-11-13 11:54:44.000000000 +0100
 @@ -6,6 +6,7 @@
  #include "head.h"
  #include "util.h"
@@ -40,20 +41,20 @@
  
  FitsCompress::FitsCompress(FitsFile* fits)
  {
-diff -ur saods9/saotk/fitsy++/file.C saods9.gcc43/saotk/fitsy++/file.C
---- saods9/saotk/fitsy++/file.C	2008-01-04 18:29:24.000000000 +0100
-+++ saods9.gcc43/saotk/fitsy++/file.C	2008-02-21 12:37:05.000000000 +0100
-@@ -6,6 +6,7 @@
+diff -ur saods9/saotk/fitsy++/file.C saods9.new/saotk/fitsy++/file.C
+--- saods9/saotk/fitsy++/file.C	2008-06-03 16:46:25.000000000 +0200
++++ saods9.new/saotk/fitsy++/file.C	2008-11-13 11:55:10.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include <iostream>
  #include <sstream>
  #include <iomanip>
- using namespace std;
 +#include <string.h>
+ using namespace std;
  
  #include "file.h"
- #include "util.h"
-diff -ur saods9/saotk/fitsy++/iis.C saods9.gcc43/saotk/fitsy++/iis.C
+diff -ur saods9/saotk/fitsy++/iis.C saods9.new/saotk/fitsy++/iis.C
 --- saods9/saotk/fitsy++/iis.C	2008-01-04 18:29:24.000000000 +0100
-+++ saods9.gcc43/saotk/fitsy++/iis.C	2008-02-21 12:36:22.000000000 +0100
++++ saods9.new/saotk/fitsy++/iis.C	2008-11-13 11:55:32.000000000 +0100
 @@ -3,6 +3,7 @@
  // For conditions of distribution and use, see copyright notice in "copyright"
  
@@ -62,81 +63,9 @@
  
  FitsIIS::FitsIIS(int width, int height)
  {
-diff -ur saods9/saotk/frame/callback.C saods9.gcc43/saotk/frame/callback.C
---- saods9/saotk/frame/callback.C	2008-01-04 18:29:25.000000000 +0100
-+++ saods9.gcc43/saotk/frame/callback.C	2008-02-21 14:59:05.000000000 +0100
-@@ -3,7 +3,7 @@
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "callback.h"
- 
-diff -ur saods9/saotk/frame/ciaoparser.C saods9.gcc43/saotk/frame/ciaoparser.C
---- saods9/saotk/frame/ciaoparser.C	2007-12-06 23:37:37.000000000 +0100
-+++ saods9.gcc43/saotk/frame/ciaoparser.C	2008-02-21 15:06:08.000000000 +0100
-@@ -132,7 +132,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/ciaoparser.Y saods9.gcc43/saotk/frame/ciaoparser.Y
---- saods9/saotk/frame/ciaoparser.Y	2008-01-04 18:44:34.000000000 +0100
-+++ saods9.gcc43/saotk/frame/ciaoparser.Y	2008-02-21 15:05:31.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/ds9parser.C saods9.gcc43/saotk/frame/ds9parser.C
---- saods9/saotk/frame/ds9parser.C	2007-12-06 23:37:38.000000000 +0100
-+++ saods9.gcc43/saotk/frame/ds9parser.C	2008-02-21 15:06:55.000000000 +0100
-@@ -333,7 +333,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/ds9parser.Y saods9.gcc43/saotk/frame/ds9parser.Y
---- saods9/saotk/frame/ds9parser.Y	2008-01-04 18:44:34.000000000 +0100
-+++ saods9.gcc43/saotk/frame/ds9parser.Y	2008-02-21 15:06:42.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/fitsdata.C saods9.gcc43/saotk/frame/fitsdata.C
---- saods9/saotk/frame/fitsdata.C	2008-01-04 18:29:25.000000000 +0100
-+++ saods9.gcc43/saotk/frame/fitsdata.C	2008-02-21 15:07:07.000000000 +0100
-@@ -5,7 +5,7 @@
- #include <stdlib.h>
- #include <limits.h>
- #include <float.h>
--#include <iostream.h>
-+#include <iostream>
- #include <math.h>
- 
- #include "fitsdata.h"
-diff -ur saods9/saotk/frame/frscale.C saods9.gcc43/saotk/frame/frscale.C
+diff -ur saods9/saotk/frame/frscale.C saods9.new/saotk/frame/frscale.C
 --- saods9/saotk/frame/frscale.C	2008-01-04 18:29:26.000000000 +0100
-+++ saods9.gcc43/saotk/frame/frscale.C	2008-02-21 11:06:29.000000000 +0100
++++ saods9.new/saotk/frame/frscale.C	2008-11-13 11:58:35.000000000 +0100
 @@ -3,6 +3,7 @@
  // For conditions of distribution and use, see copyright notice in "copyright"
  
@@ -145,156 +74,3 @@
  
  #include "frscale.h"
  
-diff -ur saods9/saotk/frame/inversescale.C saods9.gcc43/saotk/frame/inversescale.C
---- saods9/saotk/frame/inversescale.C	2008-01-04 18:29:26.000000000 +0100
-+++ saods9.gcc43/saotk/frame/inversescale.C	2008-02-21 15:06:21.000000000 +0100
-@@ -2,7 +2,7 @@
- // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
--#include <iostream.h>
-+#include <iostream>
- #include <math.h>
- 
- #include "inversescale.h"
-diff -ur saods9/saotk/frame/parser.C saods9.gcc43/saotk/frame/parser.C
---- saods9/saotk/frame/parser.C	2007-12-06 23:37:38.000000000 +0100
-+++ saods9.gcc43/saotk/frame/parser.C	2008-02-21 15:06:30.000000000 +0100
-@@ -702,7 +702,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "frame.h"
-diff -ur saods9/saotk/frame/parser.Y saods9.gcc43/saotk/frame/parser.Y
---- saods9/saotk/frame/parser.Y	2008-01-04 18:44:34.000000000 +0100
-+++ saods9.gcc43/saotk/frame/parser.Y	2008-02-21 15:07:00.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "frame.h"
-diff -ur saods9/saotk/frame/prosparser.C saods9.gcc43/saotk/frame/prosparser.C
---- saods9/saotk/frame/prosparser.C	2007-12-06 23:37:43.000000000 +0100
-+++ saods9.gcc43/saotk/frame/prosparser.C	2008-02-21 15:05:22.000000000 +0100
-@@ -153,7 +153,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/prosparser.Y saods9.gcc43/saotk/frame/prosparser.Y
---- saods9/saotk/frame/prosparser.Y	2008-01-04 18:44:34.000000000 +0100
-+++ saods9.gcc43/saotk/frame/prosparser.Y	2008-02-21 15:06:50.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/saoparser.C saods9.gcc43/saotk/frame/saoparser.C
---- saods9/saotk/frame/saoparser.C	2007-12-06 23:37:43.000000000 +0100
-+++ saods9.gcc43/saotk/frame/saoparser.C	2008-02-21 15:06:15.000000000 +0100
-@@ -123,7 +123,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/saoparser.Y saods9.gcc43/saotk/frame/saoparser.Y
---- saods9/saotk/frame/saoparser.Y	2008-01-04 18:44:34.000000000 +0100
-+++ saods9.gcc43/saotk/frame/saoparser.Y	2008-02-21 15:07:51.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/tngparser.C saods9.gcc43/saotk/frame/tngparser.C
---- saods9/saotk/frame/tngparser.C	2007-12-06 23:37:43.000000000 +0100
-+++ saods9.gcc43/saotk/frame/tngparser.C	2008-02-21 15:05:55.000000000 +0100
-@@ -169,7 +169,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/tngparser.Y saods9.gcc43/saotk/frame/tngparser.Y
---- saods9/saotk/frame/tngparser.Y	2008-01-04 18:44:34.000000000 +0100
-+++ saods9.gcc43/saotk/frame/tngparser.Y	2008-02-21 15:06:37.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/xyparser.C saods9.gcc43/saotk/frame/xyparser.C
---- saods9/saotk/frame/xyparser.C	2007-12-06 23:37:43.000000000 +0100
-+++ saods9.gcc43/saotk/frame/xyparser.C	2008-02-21 15:07:44.000000000 +0100
-@@ -198,7 +198,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/frame/xyparser.Y saods9.gcc43/saotk/frame/xyparser.Y
---- saods9/saotk/frame/xyparser.Y	2008-01-04 18:44:34.000000000 +0100
-+++ saods9.gcc43/saotk/frame/xyparser.Y	2008-02-21 15:07:34.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- #include <math.h>
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "framebase.h"
- #include "fitsimage.h"
-diff -ur saods9/saotk/widget/ps.C saods9.gcc43/saotk/widget/ps.C
---- saods9/saotk/widget/ps.C	2008-01-04 18:29:27.000000000 +0100
-+++ saods9.gcc43/saotk/widget/ps.C	2008-02-21 12:34:38.000000000 +0100
-@@ -4,6 +4,8 @@
- 
- #include "ps.h"
- #include "util.h"
-+#include <cstring>
-+using std::memcpy;
- 
- 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds9-main.patch	30 May 2008 08:43:05 -0000	1.2
+++ ds9-main.patch	15 Nov 2008 10:14:06 -0000	1.3
@@ -1,98 +1,6 @@
 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	2008-05-09 16:59:50.000000000 +0200
-+++ saods9.new/ds9/ds9.C	2008-05-09 16:57:32.000000000 +0200
+--- saods9/ds9/ds9.C	2008-10-08 21:36:37.000000000 +0200
++++ saods9.new/ds9/ds9.C	2008-11-13 11:00:49.000000000 +0100
 @@ -11,8 +11,8 @@
  
    void TclSetStartupScriptFileName(const char*);
@@ -113,10 +21,10 @@
  
    // so that tcl and tk know where to find their libs
    // we do it here before InitLibraryPath is called
--  putenv("TCL_LIBRARY=./zvfsmntpt/tcl8.4");
--  putenv("TK_LIBRARY=./zvfsmntpt/tk8.4");
-+//  putenv("TCL_LIBRARY=./zvfsmntpt/tcl8.4");
-+//  putenv("TK_LIBRARY=./zvfsmntpt/tk8.4");
+-  putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4");
+-  putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4");
++//  putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4");
++//  putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4");
  
    // invoke startup script
 -  TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
@@ -129,7 +37,7 @@
    // Tcl_Init().  Otherwise, Tcl_Init() will not be able to find
    // its startup script files.
 -  if (Zvfs_Init(interp) == TCL_ERROR)
-+/*  if (Zvfs_Init(interp) == TCL_ERROR)
++ /* if (Zvfs_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
    Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, 
  		     (Tcl_PackageInitProc*)NULL);
@@ -141,8 +49,8 @@
      Tcl_DString pwd;
      Tcl_DStringInit(&pwd);
      Tcl_GetCwd(interp, &pwd);
-@@ -105,7 +105,7 @@
- 	       Tcl_DStringValue(&pwd));
+@@ -113,7 +113,7 @@
+ #endif
      Tcl_DStringFree(&pwd);
    }
 -
@@ -150,32 +58,38 @@
    // Initialize Tcl and Tk
    if (Tcl_Init(interp))
      return TCL_ERROR;
-@@ -113,19 +113,19 @@
+@@ -121,7 +121,7 @@
    // Tk
    if (Tk_Init(interp))
      return TCL_ERROR;
 -  Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
 +//  Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
  
+   {
+     Tcl_DString pwd;
+@@ -131,17 +131,17 @@
+   }
+ 
    // Blt
 -  if (Blt_Init(interp) == TCL_ERROR)
 +/*  if (Blt_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
    Tcl_StaticPackage (interp, "BLT", Blt_Init, 
--		     (Tcl_PackageInitProc*)NULL);
-+		     (Tcl_PackageInitProc*)NULL);*/
- 
+ 		     (Tcl_PackageInitProc*)NULL);
+-
++*/
    // Tktable
 -  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_PackageInitProc*)NULL);
+-
++*/
    // Checkdns
    if (Checkdns_Init(interp) == TCL_ERROR)
-@@ -146,10 +146,10 @@
+     return TCL_ERROR;
+@@ -161,11 +161,11 @@
  		     (Tcl_PackageInitProc*)NULL);
  
    // Tclxpa
@@ -183,12 +97,13 @@
 +/*  if (Tclxpa_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
    Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init,
--		     (Tcl_PackageInitProc*)NULL);
-+		     (Tcl_PackageInitProc*)NULL);*/
- 
+ 		     (Tcl_PackageInitProc*)NULL);
+-
++*/
    // IIS
    if (Iis_Init(interp) == TCL_ERROR)
-@@ -164,7 +164,7 @@
+     return TCL_ERROR;
+@@ -179,13 +179,13 @@
  		     (Tcl_PackageInitProc*)NULL);
  
    // Tkimg
@@ -197,26 +112,123 @@
      return TCL_ERROR;
    Tcl_StaticPackage (interp, "img", 
  		     Tkimg_Init,(Tcl_PackageInitProc*)NULL);
-@@ -239,7 +239,7 @@
-   if (Tkimgwindow_Init(interp) == TCL_ERROR)
+-
++*/
+   // zlibtcl
+-  if (Zlibtcl_Init(interp) == TCL_ERROR)
++/*  if (Zlibtcl_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
-   Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
--		     (Tcl_PackageInitProc*)NULL);
-+		     (Tcl_PackageInitProc*)NULL);*/
- 
- #ifdef _MACOSX
-   if (Tkmacosx_Init(interp) == TCL_ERROR)
-@@ -256,11 +256,11 @@
+   Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
+ 		     (Tcl_PackageInitProc*)NULL);
+@@ -269,16 +269,16 @@
+   Tcl_StaticPackage (interp, "win32", Tkwin32_Init,
+ 		     (Tcl_PackageInitProc*)NULL);
  #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, "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_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY);
  
    //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY);
+-
++*/
+   return TCL_OK;
+ }
  
+diff -ur saods9/ds9/Makefile saods9.new/ds9/Makefile
+--- saods9/ds9/Makefile	2008-10-08 21:36:37.000000000 +0200
++++ saods9.new/ds9/Makefile	2008-11-13 10:55:58.000000000 +0100
+@@ -4,11 +4,7 @@
+ #--------------------------defines
+ 
+ ZDIR	= zipdir/zvfsmntpt
+-FILES	= $(ZDIR)/$(TCLVER) \
+-	$(ZDIR)/$(TKVER) \
+-	$(ZDIR)/$(BLTVER) \
+-	$(ZDIR)/$(TCLLIBVER) \
+-	$(ZDIR)/$(TKCONVER) \
++FILES	= \
+ 	$(ZDIR)/src \
+ 	$(ZDIR)/msgs \
+ 	$(ZDIR)/doc \
+@@ -22,37 +18,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)
+@@ -167,13 +167,9 @@
+ ds9.zip	: $(FILES)
+ 	cd zipdir; zip -r9 ../ds9.zip *	
+ else
+-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)
+@@ -366,6 +336,20 @@
+ 	rm -f libstdc++.a
+ endif
+ 
++# for fedora
++#--------------------------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-tcl85.patch:

Index: ds9-tcl85.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9-tcl85.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds9-tcl85.patch	12 Jan 2008 00:32:58 -0000	1.2
+++ ds9-tcl85.patch	15 Nov 2008 10:14:06 -0000	1.3
@@ -30,7 +30,7 @@
 @@ -5,6 +5,7 @@
  	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
  	-I../../include -I$(X11INCLUDE) \
- 	-I/usr/include/funtools/util -I/usr/include/blt\
+ 	-I/usr/include/funtools/util -I/usr/include/blt -I/usr/include/wcs\
 +	-I/usr/include/tk-private/unix\
  	-I../../$(ASTDIR)
  


Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ds9.spec	12 Jun 2008 16:16:21 -0000	1.12
+++ ds9.spec	15 Nov 2008 10:14:06 -0000	1.13
@@ -1,6 +1,6 @@
 Name: ds9
-Version: 5.2
-Release: 3%{?dist}
+Version: 5.4
+Release: 1%{?dist}
 Summary: Astronomical Data Visualization Application
 
 Group: Applications/Engineering
@@ -27,7 +27,7 @@
 
 BuildRequires: desktop-file-utils
 
-Requires: tcllib tktable tkimg xpa-tcl tkcon >= 2.5
+Requires: tktable tkimg xpa-tcl tkcon >= 2.5
 
 %description
 SAOImage DS9 is an astronomical imaging and data visualization application. 
@@ -92,8 +92,13 @@
 
 
 %changelog
-* Thu Jun 12 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-3
+* Thu Nov 13 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.4-1
+- New upstream source
+
+* Wed Jun 11 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-4
 - Removing dependency in etags
+
+* Wed Jun 11 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-3
 - Using tkcon
 
 * Fri May 30 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 May 2008 08:43:05 -0000	1.4
+++ sources	15 Nov 2008 10:14:06 -0000	1.5
@@ -1 +1 @@
-67a552ec2ae5278e451a5f34b153a987  ds9.5.2.tar.gz
+0ba83f8fc8732e1f569d2476cb7825cf  ds9.5.4.tar.gz




More information about the fedora-extras-commits mailing list