rpms/ds9/devel .cvsignore, 1.5, 1.6 ds9-main.patch, 1.5, 1.6 ds9-mastermake.patch, 1.2, 1.3 ds9-src.patch, 1.2, 1.3 ds9.spec, 1.21, 1.22 sources, 1.5, 1.6
Sergio Pascual
sergiopr at fedoraproject.org
Mon Mar 29 22:23:54 UTC 2010
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14317
Modified Files:
.cvsignore ds9-main.patch ds9-mastermake.patch ds9-src.patch
ds9.spec sources
Log Message:
* Tue Mar 30 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 5.5-1
- Updated to 5.5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 13 Nov 2008 19:02:14 -0000 1.5
+++ .cvsignore 29 Mar 2010 22:23:52 -0000 1.6
@@ -1 +1 @@
-ds9.5.4.tar.gz
+ds9.5.5.tar.gz
ds9-main.patch:
Makefile | 53 ++++++++++++++++++-----------------------------------
ds9.C | 41 +++++++++++++++++++++--------------------
2 files changed, 39 insertions(+), 55 deletions(-)
Index: ds9-main.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-main.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ds9-main.patch 19 Feb 2009 11:17:38 -0000 1.5
+++ ds9-main.patch 29 Mar 2010 22:23:53 -0000 1.6
@@ -1,7 +1,7 @@
-diff -ur saods9/ds9/Makefile saods9.new/ds9/Makefile
---- 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 @@
+diff -ur saods9/ds9/ds9.C saods9.new/ds9/ds9.C
+--- saods9/ds9/ds9.C 2010-03-29 23:36:00.000000000 +0200
++++ saods9.new/ds9/ds9.C 2010-03-29 23:45:50.000000000 +0200
+@@ -12,8 +12,8 @@
void TclSetStartupScriptFileName(const char*);
@@ -12,7 +12,7 @@ diff -ur saods9/ds9/Makefile saods9.new/
int Blt_Init(Tcl_Interp*);
int Tktable_Init(Tcl_Interp*);
-@@ -64,15 +64,15 @@
+@@ -65,15 +65,15 @@
appname = dupstr(argv[0]);
// set default encoding dir
@@ -32,12 +32,12 @@ diff -ur saods9/ds9/Makefile saods9.new/
}
Tcl_Interp *global_interp;
-@@ -91,13 +91,13 @@
+@@ -92,13 +92,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.
- 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);
@@ -50,15 +50,15 @@ diff -ur saods9/ds9/Makefile saods9.new/
Tcl_DStringInit(&pwd);
Tcl_GetCwd(interp, &pwd);
@@ -113,7 +113,7 @@
+ Tcl_DStringValue(&pwd));
#endif
Tcl_DStringFree(&pwd);
- }
--
-+*/
+- }
++ }*/
+
// Initialize Tcl and Tk
if (Tcl_Init(interp))
- return TCL_ERROR;
-@@ -121,7 +121,7 @@
+@@ -122,7 +122,7 @@
// Tk
if (Tk_Init(interp))
return TCL_ERROR;
@@ -67,20 +67,16 @@ diff -ur saods9/ds9/Makefile saods9.new/
{
Tcl_DString pwd;
-@@ -131,17 +131,17 @@
+@@ -130,7 +130,7 @@
+ Tcl_GetCwd(interp, &pwd);
+ Tcl_DStringFree(&pwd);
}
-
+-
++/*
// Blt
-- if (Blt_Init(interp) == TCL_ERROR)
-+/* if (Blt_Init(interp) == TCL_ERROR)
+ if (Blt_Init(interp) == TCL_ERROR)
return TCL_ERROR;
- Tcl_StaticPackage (interp, "BLT", Blt_Init,
- (Tcl_PackageInitProc*)NULL);
--
-+*/
- // Tktable
-- if (Tktable_Init(interp) == TCL_ERROR)
-+/* if (Tktable_Init(interp) == TCL_ERROR)
+@@ -142,7 +142,7 @@
return TCL_ERROR;
Tcl_StaticPackage (interp, "Tktable", Tktable_Init,
(Tcl_PackageInitProc*)NULL);
@@ -89,7 +85,7 @@ diff -ur saods9/ds9/Makefile saods9.new/
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -161,11 +161,11 @@
+@@ -162,10 +162,10 @@
(Tcl_PackageInitProc*)NULL);
// Tclxpa
@@ -97,13 +93,12 @@ diff -ur saods9/ds9/Makefile saods9.new/
+/* 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)
- return TCL_ERROR;
-@@ -179,13 +179,13 @@
+@@ -180,12 +180,12 @@
(Tcl_PackageInitProc*)NULL);
// Tkimg
@@ -111,21 +106,20 @@ diff -ur saods9/ds9/Makefile saods9.new/
+/* if (Tkimg_Init(interp) == TCL_ERROR)
return TCL_ERROR;
Tcl_StaticPackage (interp, "img",
- Tkimg_Init,(Tcl_PackageInitProc*)NULL);
--
-+*/
- // zlibtcl
-- if (Zlibtcl_Init(interp) == TCL_ERROR)
-+/* if (Zlibtcl_Init(interp) == TCL_ERROR)
+- Tkimg_Init,(Tcl_PackageInitProc*)NULL);
++ Tkimg_Init,(Tcl_PackageInitProc*)NULL);*/
+
+- // zlibtcl
++/* // zlibtcl
+ if (Zlibtcl_Init(interp) == TCL_ERROR)
return TCL_ERROR;
Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
- (Tcl_PackageInitProc*)NULL);
-@@ -269,16 +269,16 @@
+@@ -270,16 +270,17 @@
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);
@@ -141,8 +135,8 @@ diff -ur saods9/ds9/Makefile saods9.new/
}
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
+--- saods9/ds9/Makefile 2009-01-09 23:41:07.000000000 +0100
++++ saods9.new/ds9/Makefile 2010-03-29 23:50:08.000000000 +0200
@@ -4,11 +4,7 @@
#--------------------------defines
@@ -153,10 +147,10 @@ diff -ur saods9/ds9/Makefile saods9.new/
- $(ZDIR)/$(TCLLIBVER) \
- $(ZDIR)/$(TKCONVER) \
+FILES = \
+ $(ZDIR)/$(XMLRPCVER) \
$(ZDIR)/src \
$(ZDIR)/msgs \
- $(ZDIR)/doc \
-@@ -22,37 +18,14 @@
+@@ -23,37 +19,14 @@
../lib/libsaotk.a \
../lib/libtkhtml.a \
../lib/libtkmpeg.a \
@@ -195,12 +189,12 @@ diff -ur saods9/ds9/Makefile saods9.new/
endif
ifeq ($(OS),windows)
-@@ -167,13 +167,9 @@
+@@ -168,13 +141,9 @@
ds9.zip : $(FILES)
cd zipdir; zip -r9 ../ds9.zip *
else
-ds9 : null.zip ds9Base $(FILES)
-+ds9 : ds9Base $(FILES)
++ds9 : ds9Base $(FILES)
$(RM) $@
- cp ds9Base ds9.zip
- $(STRIP) ds9.zip
@@ -211,14 +205,14 @@ diff -ur saods9/ds9/Makefile saods9.new/
cp ds9 ../bin/.
debug : null.zip ds9Base $(FILES)
-@@ -366,6 +336,20 @@
+@@ -383,6 +352,20 @@
rm -f libstdc++.a
endif
+# for fedora
+#--------------------------fedora
+ifeq ($(ARCH),fedora)
-+ds9Base : $(OBJS) $(LIBS)
++ds9Base : $(OBJS) $(LIBS)
+ $(RM) $@
+ $(CXX) ${OPTS} \
+ -o $@ $(OBJS) $(LIBS) \
ds9-mastermake.patch:
Makefile | 65 ++-------------------------------------------------------------
1 file changed, 3 insertions(+), 62 deletions(-)
Index: ds9-mastermake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-mastermake.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ds9-mastermake.patch 30 May 2008 07:47:20 -0000 1.2
+++ ds9-mastermake.patch 29 Mar 2010 22:23:53 -0000 1.3
@@ -1,6 +1,6 @@
diff -ur saods9/Makefile saods9.new/Makefile
---- saods9/Makefile 2008-05-09 16:25:29.000000000 +0200
-+++ saods9.new/Makefile 2008-05-09 16:28:44.000000000 +0200
+--- saods9/Makefile 2009-01-20 20:30:35.000000000 +0100
++++ saods9.new/Makefile 2010-03-29 23:29:50.000000000 +0200
@@ -35,8 +35,8 @@
--with-tk=$(root)/$(TKDIRDIR) $(XFLAGS)
XPAFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
@@ -12,7 +12,7 @@ diff -ur saods9/Makefile saods9.new/Make
FUNTOOLSFLAGS = --prefix $(root) --with-zlib=../../lib/libz.a \
--with-wcslib=../lib/libwcs.a --enable-mainlib
endif
-@@ -235,50 +235,24 @@
+@@ -238,25 +238,12 @@
@for d in $(DIRS); do if [ ! -d $$d ]; then mkdir $$d; fi done
tcl : FORCE
@@ -36,14 +36,20 @@ diff -ur saods9/Makefile saods9.new/Make
- cd $(TCLLIBDIR); ./configure $(TCLLIBFLAGS)
- cd $(TCLLIBDIR); $(MAKE) install
+ tclxml : FORCE
+ @echo "Installing TCLXML..."
+@@ -264,10 +251,6 @@
+ cd $(TCLXMLDIR); $(MAKE) install-libraries
+
tkcon : FORCE
- @echo "Installing TkCon..."
- $(RM) -r lib/$(TKCONVER)
- mkdir lib/$(TKCONVER)
- cp $(TKCONDIR)/*.tcl lib/$(TKCONVER)
- ifeq ($(OS),macosx)
- blt : optincl
+ xmlrpc : FORCE
+ @echo "Installing XMLRPC..."
+@@ -280,19 +263,10 @@
else
blt : FORCE
endif
@@ -58,12 +64,12 @@ diff -ur saods9/Makefile saods9.new/Make
tkimg : FORCE
- @echo "Installing TKIMG..."
-- cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKIMGFLAGS) --disable-shared
+- cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure $(TKIMGFLAGS) --disable-shared
- cd $(TKIMGDIR); $(MAKE) install
tkmpeg : FORCE
@echo "Installing TKMPEG..."
-@@ -287,15 +261,11 @@
+@@ -301,15 +275,11 @@
html : FORCE
@echo "Installing HTMLWIDGET..."
@@ -80,7 +86,7 @@ diff -ur saods9/Makefile saods9.new/Make
iis : FORCE
@echo "Installing IIS..."
-@@ -306,18 +276,12 @@
+@@ -320,18 +290,12 @@
cd $(CHECKDNSDIR); $(MAKE) install
funtools: FORCE
@@ -99,7 +105,7 @@ diff -ur saods9/Makefile saods9.new/Make
sla : FORCE
@echo "Installint SLA..."
-@@ -350,17 +314,8 @@
+@@ -364,17 +328,8 @@
endif
zip : FORCE
@@ -117,7 +123,7 @@ diff -ur saods9/Makefile saods9.new/Make
#--------------------------clean
-@@ -393,36 +348,26 @@
+@@ -407,39 +362,29 @@
@for d in $(DIRS); do rm -rf $$d; done
tclclean : FORCE
@@ -132,6 +138,9 @@ diff -ur saods9/Makefile saods9.new/Make
tcllibclean: FORCE
- cd $(TCLLIBDIR); $(MAKE) distclean
+ tclxmlclean: FORCE
+ cd $(TCLXMLDIR); $(MAKE) distclean
+
bltclean: FORCE
- cd $(BLTDIR); $(MAKE) distclean
@@ -154,7 +163,7 @@ diff -ur saods9/Makefile saods9.new/Make
iisclean : FORCE
cd $(IISDIR); $(MAKE) distclean
-@@ -445,7 +390,6 @@
+@@ -462,7 +407,6 @@
endif
funtoolsclean: FORCE
@@ -162,7 +171,7 @@ diff -ur saods9/Makefile saods9.new/Make
slaclean: FORCE
cd $(SLADIR); $(MAKE) distclean
-@@ -454,7 +398,6 @@
+@@ -471,7 +415,6 @@
cd $(ASTDIR); $(MAKE) distclean
wcssubsclean: FORCE
@@ -170,7 +179,7 @@ diff -ur saods9/Makefile saods9.new/Make
riceclean: FORCE
cd $(RICEDIR); $(MAKE) distclean
-@@ -466,10 +409,8 @@
+@@ -483,10 +426,8 @@
cd $(PLIODIR); $(MAKE) distclean
zipclean: FORCE
ds9-src.patch:
ds9.tcl | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
Index: ds9-src.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-src.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ds9-src.patch 30 May 2008 07:47:20 -0000 1.2
+++ ds9-src.patch 29 Mar 2010 22:23:53 -0000 1.3
@@ -1,7 +1,7 @@
diff -ur saods9/src/ds9.tcl saods9.new/src/ds9.tcl
---- 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 @@
+--- saods9/src/ds9.tcl 2009-01-27 19:35:38.000000000 +0100
++++ saods9.new/src/ds9.tcl 2010-03-30 00:07:56.000000000 +0200
+@@ -224,25 +224,35 @@
# 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
@@ -31,6 +31,7 @@ diff -ur saods9/src/ds9.tcl saods9.new/s
- source $ds9(root)/tkcon2.5/tkcon.tcl
+ package require tkcon
+ source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
- source $ds9(root)/blt2.4/graph.tcl
- source $ds9(root)/blt2.4/tabset.tcl
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ds9.spec 24 Jul 2009 20:35:01 -0000 1.21
+++ ds9.spec 29 Mar 2010 22:23:53 -0000 1.22
@@ -1,6 +1,6 @@
Name: ds9
-Version: 5.4
-Release: 7%{?dist}
+Version: 5.5
+Release: 1%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
@@ -92,6 +92,9 @@ update-desktop-database &> /dev/null ||
%changelog
+* Tue Mar 30 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 5.5-1
+- Updated to 5.5
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 13 Nov 2008 19:02:14 -0000 1.5
+++ sources 29 Mar 2010 22:23:53 -0000 1.6
@@ -1 +1 @@
-0ba83f8fc8732e1f569d2476cb7825cf ds9.5.4.tar.gz
+0940ee2d5273f80ea8e792ef77d488ab ds9.5.5.tar.gz
More information about the scm-commits
mailing list