rpms/ds9/F-12 ds9-frame.patch, 1.4, 1.5 ds9-main.patch, 1.5, 1.6 ds9-mastermake.patch, 1.2, 1.3 ds9-src.patch, 1.2, 1.3 ds9-tcl85.patch, 1.5, 1.6 ds9.spec, 1.21, 1.22 sources, 1.5, 1.6
Sergio Pascual
sergiopr at fedoraproject.org
Wed Jul 14 13:28:33 UTC 2010
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32326
Modified Files:
ds9-frame.patch ds9-main.patch ds9-mastermake.patch
ds9-src.patch ds9-tcl85.patch ds9.spec sources
Log Message:
* Wed Jul 14 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 5.7-1
- Updated to 5.7
ds9-frame.patch:
Makefile | 2 -
fitsimage.C | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 95 insertions(+), 2 deletions(-)
Index: ds9-frame.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-12/ds9-frame.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ds9-frame.patch 19 Feb 2009 11:17:38 -0000 1.4
+++ ds9-frame.patch 14 Jul 2010 13:28:33 -0000 1.5
@@ -1,116 +1,124 @@
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
+--- saods9/saotk/frame/fitsimage.C 2009-10-01 20:05:23.000000000 +0200
++++ saods9.new/saotk/frame/fitsimage.C 2010-03-30 13:35:16.000000000 +0200
+@@ -27,6 +27,99 @@
extern "C" {
FitsHead* wcshead = NULL;
-- char* ksearchh(char*, char*);
+ char* ksearchh(char*, char*);
+ char* ksearchh(char* hstring, char* keyword)
++ /* Find entry for keyword keyword in FITS header string hstring.
++ (the keyword may have a maximum of eight letters)
++ NULL is returned if the keyword is not found */
++
++ /*const char *hstring; character string containing fits-style header
++ information in the format <keyword>= <value> {/ <comment>}
++ the default is that each entry is 80 characters long;
++ however, lines may be of arbitrary length terminated by
++ nulls, carriage returns or linefeeds, if packed is true. */
++ /*const char *keyword; character string containing the name of the variable
++ to be returned. ksearch searches for a line beginning
++ with this string. The string may be a character
++ literal or a character variable terminated by a null
++ or '$'. it is truncated to 8 characters. */
+ {
-+/* Find entry for keyword keyword in FITS header string hstring.
-+ (the keyword may have a maximum of eight letters)
-+ NULL is returned if the keyword is not found */
-+
-+/* char *hstring; character string containing fits-style header
-+ information in the format <keyword>= <value> {/ <comment>}
-+ the default is that each entry is 80 characters long;
-+ however, lines may be of arbitrary length terminated by
-+ nulls, carriage returns or linefeeds, if packed is true. */
-+/*char *keyword; character string containing the name of the variable
-+ to be returned. ksearch searches for a line beginning
-+ with this string. The string may be a character
-+ literal or a character variable terminated by a null
-+ or '$'. it is truncated to 8 characters. */
-+{
-+ char *loc, *headnext, *headlast, *pval, *lc, *line;
++ const char *headlast;
++ char *loc, *headnext, *pval, *lc, *line;
+ int icol, nextchar, lkey, nleft, lhead, lmax;
+
+#ifdef USE_SAOLIB
-+ int iel=1, ip=1, nel, np, ier;
-+ char *get_fits_head_str();
++ int iel=1, ip=1, nel, np, ier;
++ char *get_fits_head_str();
+
-+ if( !use_saolib ){
++ if( !use_saolib ){
+#endif
+
+ pval = 0;
-+static int lhead0 = 0;
-+/* Find current length of header string */
++ static int lhead0 = 0;
++ /* Find current length of header string */
+ if (lhead0)
-+ lmax = lhead0;
++ lmax = lhead0;
+ else
-+ lmax = 256000;
++ lmax = 256000;
+ for (lhead = 0; lhead < lmax; lhead++) {
-+ if (hstring[lhead] == (char) 0)
-+ break;
-+ }
++ if (hstring[lhead] == (char) 0)
++ break;
++ }
+
-+/* Search header string for variable name */
++ /* Search header string for variable name */
+ headlast = hstring + lhead;
-+ headnext = hstring;
++ headnext = (char *) hstring;
+ pval = NULL;
+ while (headnext < headlast) {
-+ nleft = headlast - headnext;
-+ loc = strncsrch (headnext, keyword, nleft);
++ nleft = headlast - headnext;
++ loc = strncsrch (headnext, keyword, nleft);
+
-+ /* Exit if keyword is not found */
-+ if (loc == NULL) {
-+ break;
-+ }
-+
-+ icol = (loc - hstring) % 80;
-+ lkey = strlen (keyword);
-+ nextchar = (int) *(loc + lkey);
-+
-+ /* If this is not in the first 8 characters of a line, keep searching */
-+ if (icol > 7)
-+ headnext = loc + 1;
-+
-+ /* If parameter name in header is longer, keep searching */
-+ else if (nextchar != 61 && nextchar > 32 && nextchar < 127)
-+ headnext = loc + 1;
-+
-+ /* If preceeding characters in line are not blanks, keep searching */
-+ else {
-+ line = loc - icol;
-+ for (lc = line; lc < loc; lc++) {
-+ if (*lc != ' ')
-+ headnext = loc + 1;
-+ }
-+
-+ /* Return pointer to start of line if match */
-+ if (loc >= headnext) {
-+ pval = line;
-+ break;
-+ }
-+ }
-+ }
-+/* Return pointer to calling program */
-+ return (pval);
++ /* Exit if keyword is not found */
++ if (loc == NULL) {
++ break;
++ }
++
++ icol = (loc - hstring) % 80;
++ lkey = strlen (keyword);
++ nextchar = (int) *(loc + lkey);
++
++ /* If this is not in the first 8 characters of a line, keep searching */
++ if (icol > 7)
++ headnext = loc + 1;
++
++ /* If parameter name in header is longer, keep searching */
++ else if (nextchar != 61 && nextchar > 32 && nextchar < 127)
++ headnext = loc + 1;
++
++ /* If preceeding characters in line are not blanks, keep searching */
++ else {
++ line = loc - icol;
++ for (lc = line; lc < loc; lc++) {
++ if (*lc != ' ')
++ headnext = loc + 1;
++ }
++
++ /* Return pointer to start of line if match */
++ if (loc >= headnext) {
++ pval = line;
++ break;
++ }
++ }
++ }
++
++ /* Return pointer to calling program */
++ return (pval);
+
+#ifdef USE_SAOLIB
-+ }
-+ else {
-+ if (get_fits_head_str(keyword,iel,ip,&nel,&np,&ier,hstring) != NULL)
-+ return(hstring);
-+ else
-+ return(NULL);
-+ }
++ }
++ else {
++ if (get_fits_head_str(keyword,iel,ip,&nel,&np,&ier,hstring) != NULL)
++ return(hstring);
++ else
++ return(NULL);
++ }
+#endif
-+}
-+}
++ }
char* findit(char* cards, char* key)
{
+@@ -35,7 +128,7 @@
+ else
+ return ksearchh(cards, key);
+ }
+-};
++}
+
+ FitsImage::FitsImage(Base* p)
+ {
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
+--- saods9/saotk/frame/Makefile 2010-03-30 13:25:51.000000000 +0200
++++ saods9.new/saotk/frame/Makefile 2010-03-30 13:26:43.000000000 +0200
@@ -4,7 +4,7 @@
CXXFLAGS = $(CXXOPT) -w \
-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/wcs\
+ -I/usr/include/libxml2 \
-I../../$(ASTDIR)
- SS = \
ds9-main.patch:
Makefile | 53 ++++++++++++++++++-----------------------------------
ds9.C | 42 +++++++++++++++++++++---------------------
2 files changed, 39 insertions(+), 56 deletions(-)
Index: ds9-main.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-12/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 14 Jul 2010 13:28:33 -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 2009-10-01 18:53:59.000000000 +0200
++++ saods9.new/ds9/ds9.C 2010-03-30 09:57:40.000000000 +0200
+@@ -13,8 +13,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 @@
+@@ -73,15 +73,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 @@
+@@ -100,13 +100,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);
@@ -49,16 +49,16 @@ diff -ur saods9/ds9/Makefile saods9.new/
Tcl_DString pwd;
Tcl_DStringInit(&pwd);
Tcl_GetCwd(interp, &pwd);
-@@ -113,7 +113,7 @@
+@@ -124,7 +124,7 @@
+ Tcl_DStringValue(&pwd));
#endif
Tcl_DStringFree(&pwd);
- }
--
-+*/
+- }
++ }*/
+
// Initialize Tcl and Tk
if (Tcl_Init(interp))
- return TCL_ERROR;
-@@ -121,7 +121,7 @@
+@@ -133,7 +133,7 @@
// Tk
if (Tk_Init(interp))
return TCL_ERROR;
@@ -67,7 +67,7 @@ diff -ur saods9/ds9/Makefile saods9.new/
{
Tcl_DString pwd;
-@@ -131,17 +131,17 @@
+@@ -143,17 +143,17 @@
}
// Blt
@@ -89,7 +89,7 @@ diff -ur saods9/ds9/Makefile saods9.new/
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -161,11 +161,11 @@
+@@ -173,11 +173,11 @@
(Tcl_PackageInitProc*)NULL);
// Tclxpa
@@ -103,8 +103,8 @@ diff -ur saods9/ds9/Makefile saods9.new/
// IIS
if (Iis_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -179,13 +179,13 @@
- (Tcl_PackageInitProc*)NULL);
+@@ -195,7 +195,7 @@
+ return TCL_ERROR;
// Tkimg
- if (Tkimg_Init(interp) == TCL_ERROR)
@@ -112,20 +112,18 @@ diff -ur saods9/ds9/Makefile saods9.new/
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)
+@@ -271,7 +271,7 @@
return TCL_ERROR;
- Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
+ Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
(Tcl_PackageInitProc*)NULL);
-@@ -269,16 +269,16 @@
- Tcl_StaticPackage (interp, "win32", Tkwin32_Init,
- (Tcl_PackageInitProc*)NULL);
- #endif
-
+*/
+ // Signal_Ext
+ #ifndef _WIN32
+ if (Signal_ext_Init(interp) == TCL_ERROR)
+@@ -295,14 +295,14 @@
+ #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,25 +139,25 @@ 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-09-30 22:35:26.000000000 +0200
++++ saods9.new/ds9/Makefile 2010-03-30 10:00:57.000000000 +0200
@@ -4,11 +4,7 @@
#--------------------------defines
ZDIR = zipdir/zvfsmntpt
--FILES = $(ZDIR)/$(TCLVER) \
+-FFILES = $(ZDIR)/$(TCLVER) \
- $(ZDIR)/$(TKVER) \
- $(ZDIR)/$(BLTVER) \
- $(ZDIR)/$(TCLLIBVER) \
- $(ZDIR)/$(TKCONVER) \
-+FILES = \
++FFILES = \
+ $(ZDIR)/$(XMLRPCVER) \
$(ZDIR)/src \
$(ZDIR)/msgs \
- $(ZDIR)/doc \
-@@ -22,37 +18,14 @@
- ../lib/libsaotk.a \
+@@ -31,38 +27,15 @@
../lib/libtkhtml.a \
../lib/libtkmpeg.a \
+ ../lib/$(TCLXMLVER)/libTclxml3.2.a \
- ../lib/$(TKIMGVER)/libtkimgwindow1.3.a \
- ../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \
- ../lib/$(TKIMGVER)/libjpegtcl1.0.a \
@@ -187,23 +185,24 @@ diff -ur saods9/ds9/Makefile saods9.new/
- ../lib/libz.a \
- ../lib/libxpa.a \
../lib/libiis.a \
-- ../lib/libcheckdns.a \
+ ../lib/libcheckdns.a \
+- ../lib/libsignal_ext.a \
- ../lib/libBLT24.a \
- ../lib/libtk8.4.a \
- ../lib/libtcl8.4.a
-+ ../lib/libcheckdns.a
++ ../lib/libsignal_ext.a
endif
ifeq ($(OS),windows)
-@@ -167,13 +167,9 @@
+@@ -180,13 +153,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
+- strip ds9.zip
- cat null.zip >> ds9.zip
- cd zipdir; zip -rA9 ../ds9.zip *
- mv ds9.zip ds9
@@ -211,20 +210,20 @@ diff -ur saods9/ds9/Makefile saods9.new/
cp ds9 ../bin/.
debug : null.zip ds9Base $(FILES)
-@@ -366,6 +336,20 @@
+@@ -357,6 +326,20 @@
rm -f libstdc++.a
endif
+# for fedora
+#--------------------------fedora
+ifeq ($(ARCH),fedora)
-+ds9Base : $(OBJS) $(LIBS)
++ds9Base : $(OBJS) $(LIBS)
+ $(RM) $@
+ $(CXX) ${OPTS} \
+ -o $@ $(OBJS) $(LIBS) \
+ -L$(X11LIB) -lX11 \
+ -ldl -lpthread \
-+ -ltk -ltcl -L${LIBDIR}/blt2.4 -lBLT24 \
++ -ltk -ltcl -L${LIBDIR}/blt2.4 -lBLT24 -lxml2 \
+ -lfuntools -lwcs -lz
+endif
+
ds9-mastermake.patch:
Makefile | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
Index: ds9-mastermake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-12/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 14 Jul 2010 13:28:33 -0000 1.3
@@ -1,183 +1,61 @@
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
-@@ -35,8 +35,8 @@
- --with-tk=$(root)/$(TKDIRDIR) $(XFLAGS)
- XPAFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
- $(XFLAGS)
-- HTMLFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIR) \
-- --with-tk=$(root)/$(TKDIR) $(XFLAGS)
-+ HTMLFLAGS = \
-+ $(XFLAGS)
- FUNTOOLSFLAGS = --prefix $(root) --with-zlib=../../lib/libz.a \
- --with-wcslib=../lib/libwcs.a --enable-mainlib
- endif
-@@ -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
-
- 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
-
- tktable : FORCE
-- @echo "Installing TkTable..."
-- cd $(TKTABLEDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKTABLEFLAGS) --disable-shared
-- cd $(TKTABLEDIR); $(MAKE); $(MAKE) install
-
- tcllib : FORCE
-- @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
- blt : FORCE
- endif
-- @echo "Installing BLT..."
-- cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(BLTFLAGS)
-- cd $(BLTDIR); $(MAKE); $(MAKE) install
-
- zlib : FORCE
-- @echo "Installing zlib..."
-- cd $(ZLIBDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(ZLIBFLAGS)
-- cd $(ZLIBDIR); $(MAKE) install
+--- saods9/Makefile 2009-09-17 18:41:08.000000000 +0200
++++ saods9.new/Makefile 2010-03-30 12:07:08.000000000 +0200
+@@ -176,15 +176,13 @@
+ #--------------------------build
+ all : build
+
+-build : dirs \
+- tcl tk \
+- tktable tcllib tkcon xmlrpc blt \
+- zlib tclxml tkimg tkmpeg html \
+- xpa iis checkdns $(SIGNAL) funtools \
+- sla ast wcssubs \
++build : dirs xmlrpc \
++ tclxml tkmpeg html \
++ iis checkdns $(SIGNAL) \
++ sla ast \
+ rice hcompress plio \
+ $(OPTDIR) \
+- saotk zip zvfs ds9
++ saotk ds9
+
+ doc : FORCE
+ @echo "Making Documentation..."
+@@ -284,7 +282,7 @@
+
+ tclxml : FORCE
+ @echo "Installing TCLXML..."
+- cd $(TCLXMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared --disable-threads --with-xml-static=1 $(TCLXMLFLAGS)
++ cd $(TCLXMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --exec-prefix $(root) --disable-shared --disable-threads --with-xml-static=1 $(TCLXMLFLAGS)
+ cd $(TCLXMLDIR); $(MAKE); $(MAKE) install
tkimg : FORCE
-- @echo "Installing TKIMG..."
-- cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKIMGFLAGS) --disable-shared
-- cd $(TKIMGDIR); $(MAKE) install
-
- tkmpeg : FORCE
- @echo "Installing TKMPEG..."
-@@ -287,15 +261,11 @@
+@@ -299,7 +297,7 @@
html : FORCE
@echo "Installing HTMLWIDGET..."
-- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure $(HTMLFLAGS) --enable-shared=no
-+ cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure $(HTMLFLAGS) --enable-shared=no --with-tcl=$(LIBDIR)
+- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no
++ cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(LIBDIR) $(XFLAGS) --enable-shared=no
cd $(HTMLDIR); $(MAKE)
cp $(HTMLDIR)/libtkhtml.a lib/.
- xpa : FORCE
-- @echo "Installing XPA..."
-- cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(OPTS) $(LIBS)' ./configure $(XPAFLAGS) --disable-shared
-- cd $(XPADIR); $(MAKE); $(MAKE) install
-- cd bin; $(STRIP) xpa*
-
- iis : FORCE
- @echo "Installing IIS..."
-@@ -306,18 +276,12 @@
- cd $(CHECKDNSDIR); $(MAKE) install
-
- funtools: FORCE
-- @echo "Installing Funtools..."
-- cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(FUNTOOLSFLAGS)
-- cd $(FUNTOOLSDIR); $(MAKE) lib
-- cp $(FUNTOOLSDIR)/libfuntools.a lib/.
-
- ast : FORCE
- @echo "Installing AST..."
- cd $(ASTDIR); $(MAKE) install
-
- wcssubs : FORCE
-- @echo "Installing WCSSUBS..."
-- cd $(WCSSUBSDIR); $(MAKE) install
-
- sla : FORCE
- @echo "Installint SLA..."
-@@ -350,17 +314,8 @@
- endif
-
- zip : FORCE
-- @echo "Installing ZIP..."
-- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) CC='$(CC)' CFLAGS='$(OPTS) -I. -DUNIX' LFLAGS1='$(OPTS)' -f unix/Makefile generic
-- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) CC='$(CC)' CFLAGS='$(OPTS) -I. -DUNIX' LFLAGS1='$(OPTS)' -f unix/Makefile install
-- cd $(ZIPDIR); $(RM) libzip.a
-- cd $(ZIPDIR); $(AR) -cr libzip.a $(ZIPOBJS)
-- cp $(ZIPDIR)/libzip.a lib/.
-
- zvfs : FORCE
-- @echo "Installing ZVFS..."
-- cd $(ZVFSDIR); $(MAKE)
-- cd $(ZVFSDIR); $(MAKE) install
-
- #--------------------------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
+@@ -383,14 +381,12 @@
+ scrub : FORCE
+ find . -name "*[~#]" -exec rm {} \;
+
+-distclean : tclclean tkclean \
+- tktableclean tcllibclean bltclean \
+- zlibclean tclxmlclean tkimgclean tkmpegclean htmlclean \
+- xpaclean iisclean checkdnsclean $(SIGNALCLEAN) funtoolsclean \
+- slaclean astclean wcssubsclean \
++distclean : tclxmlclean tkmpegclean htmlclean \
++ iisclean checkdnsclean $(SIGNALCLEAN) \
++ slaclean astclean \
+ riceclean hcompressclean plioclean \
+ $(OPTDIRCLEAN) \
+- saotkclean zipclean zvfsclean ds9clean srcclean \
++ saotkclean ds9clean srcclean \
+ dirsclean
+ $(RM) core *~ *#
ds9-src.patch:
ds9.tcl | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
Index: ds9-src.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-12/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 14 Jul 2010 13:28:33 -0000 1.3
@@ -1,51 +1,49 @@
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 @@
- # 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}]} {
-+ set ds9(root) "/usr/share/ds9"
-
-- source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl
-- source $ds9(root)/tcl8.4/http2.5/http.tcl
-+ 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
-+ 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
-+ 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
+--- saods9/src/ds9.tcl 2009-09-11 00:19:00.000000000 +0200
++++ saods9.new/src/ds9.tcl 2010-03-30 11:23:46.000000000 +0200
+@@ -34,24 +34,32 @@
+ option add {*Label*BorderWidth} 2
+
+ # initialize
+-set ds9(root) "zvfsmntpt"
++set ds9(root) "/usr/share/ds9"
+
+-source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl
+-source $ds9(root)/tcl8.4/http2.5/http.tcl
++package require msgcat
++package require http
+
+-source $ds9(root)/tk8.4/tearoff.tcl
++package require base64
++package require log
++package require ftp
++package require textutil::repeat
++package require textutil::tabify
+
+-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)/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
++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
+ source $ds9(root)/src/source.tcl
ds9-tcl85.patch:
htmlwidget/makemake.tcl.in | 4 +---
saotk/colorbar/Makefile | 2 +-
saotk/frame/Makefile | 1 +
saotk/util/tkpostscript.h | 1 +
4 files changed, 4 insertions(+), 4 deletions(-)
Index: ds9-tcl85.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-12/ds9-tcl85.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ds9-tcl85.patch 19 Feb 2009 11:17:38 -0000 1.5
+++ ds9-tcl85.patch 14 Jul 2010 13:28:33 -0000 1.6
@@ -1,6 +1,6 @@
diff -ur saods9/htmlwidget/makemake.tcl.in saods9.new/htmlwidget/makemake.tcl.in
--- saods9/htmlwidget/makemake.tcl.in 2005-11-09 01:06:08.000000000 +0100
-+++ saods9.new/htmlwidget/makemake.tcl.in 2008-01-12 01:09:50.000000000 +0100
++++ saods9.new/htmlwidget/makemake.tcl.in 2010-03-30 12:38:29.000000000 +0200
@@ -360,9 +360,7 @@
# A target to build everything.
@@ -13,8 +13,8 @@ diff -ur saods9/htmlwidget/makemake.tcl.
lappend all tkhtml at TARGET_SHLIB_EXT@
# lappend all tkhtml.so
diff -ur saods9/saotk/colorbar/Makefile saods9.new/saotk/colorbar/Makefile
---- saods9/saotk/colorbar/Makefile 2007-12-05 20:00:03.000000000 +0100
-+++ saods9.new/saotk/colorbar/Makefile 2008-01-12 01:11:43.000000000 +0100
+--- saods9/saotk/colorbar/Makefile 2010-03-30 12:37:51.000000000 +0200
++++ saods9.new/saotk/colorbar/Makefile 2010-03-30 12:38:49.000000000 +0200
@@ -2,7 +2,7 @@
CXXFLAGS = $(CXXOPT) \
@@ -25,19 +25,19 @@ diff -ur saods9/saotk/colorbar/Makefile
SS = \
cbgrid.C \
diff -ur saods9/saotk/frame/Makefile saods9.new/saotk/frame/Makefile
---- saods9/saotk/frame/Makefile 2008-01-12 01:05:17.000000000 +0100
-+++ saods9.new/saotk/frame/Makefile 2008-01-12 01:12:14.000000000 +0100
-@@ -5,6 +5,7 @@
- -I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
+--- saods9/saotk/frame/Makefile 2010-03-30 12:37:51.000000000 +0200
++++ saods9.new/saotk/frame/Makefile 2010-03-30 12:39:27.000000000 +0200
+@@ -6,6 +6,7 @@
-I../../include -I$(X11INCLUDE) \
-I/usr/include/funtools/util -I/usr/include/blt -I/usr/include/wcs\
-+ -I/usr/include/tk-private/unix\
+ -I/usr/include/libxml2 \
++ -I/usr/include/tk-private/unix \
-I../../$(ASTDIR)
SS = \
diff -ur saods9/saotk/util/tkpostscript.h saods9.new/saotk/util/tkpostscript.h
---- saods9/saotk/util/tkpostscript.h 2008-01-12 01:05:17.000000000 +0100
-+++ saods9.new/saotk/util/tkpostscript.h 2008-01-12 01:10:15.000000000 +0100
+--- saods9/saotk/util/tkpostscript.h 2010-03-30 12:37:51.000000000 +0200
++++ saods9.new/saotk/util/tkpostscript.h 2010-03-30 12:39:49.000000000 +0200
@@ -4,6 +4,7 @@
// this is copied from tkCanvPs.c
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-12/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 14 Jul 2010 13:28:33 -0000 1.22
@@ -1,6 +1,6 @@
Name: ds9
-Version: 5.4
-Release: 7%{?dist}
+Version: 5.7
+Release: 1%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
@@ -17,13 +17,13 @@ Patch4: ds9-mastermake.patch
Patch5: ds9-saotk.patch
Patch6: ds9-src.patch
Patch7: ds9-tcl85.patch
-Patch8: ds9-gcc43.patch
-Patch9: ds9-notags.patch
+Patch8: ds9-notags.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: zlib-devel funtools-devel
BuildRequires: blt-devel tk-devel
+BuildRequires: libxml2-devel libxslt-devel
BuildRequires: desktop-file-utils
@@ -47,7 +47,6 @@ extensible.
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%build
%{__cp} %{SOURCE2} make.include
@@ -92,6 +91,9 @@ update-desktop-database &> /dev/null ||
%changelog
+* Wed Jul 14 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 5.7-1
+- Updated to 5.7
+
* 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/F-12/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 14 Jul 2010 13:28:33 -0000 1.6
@@ -1 +1 @@
-0ba83f8fc8732e1f569d2476cb7825cf ds9.5.4.tar.gz
+f19f09ee30161f960d5b18bbe71e46f3 ds9.5.7.tar.gz
More information about the scm-commits
mailing list