rpms/ds9/F-7 ds9-fitsy.patch, NONE, 1.1 ds9-frame.patch, NONE, 1.1 ds9-htmlw.patch, NONE, 1.1 ds9-main.patch, NONE, 1.1 ds9-mastermake.patch, NONE, 1.1 ds9-saotk.patch, NONE, 1.1 ds9-src.patch, NONE, 1.1 ds9.make.fedora, 1.1, 1.2 ds9.spec, 1.2, 1.3 sources, 1.2, 1.3 FlexLexer.h, 1.1, NONE ds9-external.patch, 1.2, NONE ds9-flex.patch, 1.1, NONE ds9-generate-tarball.sh, 1.1, NONE
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Sat Jan 12 01:30:38 UTC 2008
- Previous message (by thread): rpms/anaconda/devel .cvsignore, 1.475, 1.476 anaconda.spec, 1.615, 1.616 sources, 1.607, 1.608
- Next message (by thread): rpms/wine/F-7 .cvsignore, 1.47, 1.48 sources, 1.48, 1.49 wine.spec, 1.67, 1.68
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23404
Modified Files:
ds9.make.fedora ds9.spec sources
Added Files:
ds9-fitsy.patch ds9-frame.patch ds9-htmlw.patch ds9-main.patch
ds9-mastermake.patch ds9-saotk.patch ds9-src.patch
Removed Files:
FlexLexer.h ds9-external.patch ds9-flex.patch
ds9-generate-tarball.sh
Log Message:
* Tue Jan 08 2008 Sergio Pascual <sergiopr at fedoraproject.org> 5.1-1
- New upstream source
- Reorganized patches
ds9-fitsy.patch:
--- NEW FILE ds9-fitsy.patch ---
diff -ur saods9/saotk/fitsy++/Makefile saods9.new/saotk/fitsy++/Makefile
--- saods9/saotk/fitsy++/Makefile 2007-04-19 00:28:04.000000000 +0200
+++ saods9.new/saotk/fitsy++/Makefile 2007-12-08 16:36:40.000000000 +0100
@@ -3,8 +3,8 @@
CXXFLAGS = $(CXXOPT) -I. -I.. -I../vector -I../util \
-I../../include -I$(X11INCLUDE) \
- -I../../$(FUNTOOLSDIR)/filter -I../../$(FUNTOOLSDIR)/fitsy \
- -I../../$(FUNTOOLSDIR)/util
+ -I/usr/include/funtools/filt -I/usr/include/funtools/fitsy \
+ -I/usr/include/funtools/util -I/usr/include/wcs
SS = \
alloc.C \
ds9-frame.patch:
--- NEW FILE ds9-frame.patch ---
diff -ur saods9/saotk/frame/fitsimage.C saods9.new/saotk/frame/fitsimage.C
--- saods9/saotk/frame/fitsimage.C 2007-05-22 20:36:50.000000000 +0200
+++ saods9.new/saotk/frame/fitsimage.C 2007-12-08 16:36:40.000000000 +0100
@@ -31,7 +31,99 @@
// this is kluge to speed up doug minks wcssubs 'ksearch' routine
extern "C" {
FitsHead* wcshead = NULL;
- 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 */
+
+/* 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;
+ int icol, nextchar, lkey, nleft, lhead, lmax;
+
+#ifdef USE_SAOLIB
+ int iel=1, ip=1, nel, np, ier;
+ char *get_fits_head_str();
+
+ if( !use_saolib ){
+#endif
+
+ pval = 0;
+static int lhead0 = 0;
+/* Find current length of header string */
+ if (lhead0)
+ lmax = lhead0;
+ else
+ lmax = 256000;
+ for (lhead = 0; lhead < lmax; lhead++) {
+ if (hstring[lhead] == (char) 0)
+ break;
+ }
+
+/* Search header string for variable name */
+ headlast = hstring + lhead;
+ headnext = hstring;
+ pval = NULL;
+ while (headnext < headlast) {
+ 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);
+
+#ifdef USE_SAOLIB
+ }
+ 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)
{
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
@@ -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../../$(ASTDIR)
SS = \
ds9-htmlw.patch:
--- NEW FILE ds9-htmlw.patch ---
diff -ur saods9/htmlwidget/configure saods9.new/htmlwidget/configure
--- saods9/htmlwidget/configure 2006-05-01 19:47:09.000000000 +0200
+++ saods9.new/htmlwidget/configure 2007-12-08 16:36:40.000000000 +0100
@@ -1052,11 +1052,11 @@
echo "$ac_t""$BUILD_TCLSH" 1>&6
else
if test "$with_tcl" != ""; then
- if test -x "$with_tcl/$tclsubdir/tclsh"; then
- BUILD_TCLSH=$with_tcl/$tclsubdir/tclsh
+ if test -x "$with_tcl/tclsh"; then
+ BUILD_TCLSH=$with_tcl/tclsh
else
- if test -x "$with_tcl/$tclsubdir/tclsh8.0"; then
- BUILD_TCLSH=$with_tcl/$tclsubdir/tclsh8.0
+ if test -x "$with_tcl/tclsh8.0"; then
+ BUILD_TCLSH=$with_tcl/tclsh8.0
fi
fi
fi
@@ -1137,7 +1137,7 @@
if test "$enable_shared" = "yes"; then
ok=0
if test "$with_tcl" != ""; then
- tclconf=$with_tcl/unix/tclConfig.sh
+ tclconf=$with_tcl/tclConfig.sh
ac_safe=`echo "$tclconf" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $tclconf""... $ac_c" 1>&6
@@ -1494,7 +1494,7 @@
TARGET_TCL_LIBS="$config_TARGET_TCL_LIBS"
else
if test "$with_tcl" != ""; then
- extra=`echo $with_tcl/$tclsubdir/libtcl8*.a`
+ extra=`echo -ltcl`
fi
CC=$TARGET_CC
echo $ac_n "checking for sin""... $ac_c" 1>&6
ds9-main.patch:
--- NEW FILE ds9-main.patch ---
diff -ur saods9/ds9/ds9.C saods9.new/ds9/ds9.C
--- saods9/ds9/ds9.C 2007-06-19 19:13:04.000000000 +0200
+++ saods9.new/ds9/ds9.C 2007-12-08 16:36:40.000000000 +0100
@@ -10,8 +10,8 @@
void TclSetStartupScriptFileName(const char*);
- int Zvfs_Init(Tcl_Interp*);
- int Zvfs_Mount(Tcl_Interp*, char*, char *);
+/* int Zvfs_Init(Tcl_Interp*);
+ int Zvfs_Mount(Tcl_Interp*, char*, char *);*/
int Blt_Init(Tcl_Interp*);
int Tktable_Init(Tcl_Interp*);
@@ -57,16 +57,16 @@
appname = dupstr(argv[0]);
// set default encoding dir
- Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4");
+// Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4");
// 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");
// 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;
}
@@ -82,20 +82,20 @@
// 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)
return TCL_ERROR;
Tcl_StaticPackage (interp, "zvfs", Zvfs_Init,
- (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(),
Tcl_DStringValue(&pwd));
Tcl_DStringFree(&pwd);
- }
+ }*/
// Initialize Tcl and Tk
if (Tcl_Init(interp))
@@ -104,7 +104,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);
#ifdef __WIN32__
if (console) {
@@ -115,16 +115,18 @@
#endif
// 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_PkgRequire(interp, "BLT", "2.4", 0);
// 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_PkgRequire(interp, "Tktable", "2.9", 0);
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
@@ -145,10 +147,12 @@
(Tcl_PackageInitProc*)NULL);
// Tclxpa
- if (Tclxpa_Init(interp) == TCL_ERROR)
+/* if (Tclxpa_Init(interp) == TCL_ERROR)
return TCL_ERROR;
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 @@
(Tcl_PackageInitProc*)NULL);
// Tkimg
- 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)
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 @@
#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_SetVar(interp, "blt_library", LIBDIR"/blt2.4", 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:
--- NEW FILE ds9-mastermake.patch ---
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
@@ -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
@@ -232,44 +232,28 @@
@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..."
- cd $(TCLLIBDIR); ./configure $(TCLLIBFLAGS)
- cd $(TCLLIBDIR); $(MAKE) install
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
+ @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 @@
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); $(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*
+ @echo "Using native xpa..."
iis : FORCE
@echo "Installing IIS..."
@@ -297,18 +278,14 @@
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/.
+ @echo "Using native funtools..."
ast : FORCE
@echo "Installing AST..."
cd $(ASTDIR); $(MAKE) install
wcssubs : FORCE
- @echo "Installing WCSSUBS..."
- cd $(WCSSUBSDIR); $(MAKE) install
+ @echo "Using native wcs..."
sla : FORCE
@echo "Installint SLA..."
@@ -337,17 +314,10 @@
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/.
+ @echo "ZIP not needed..."
zvfs : FORCE
- @echo "Installing ZVFS..."
- cd $(ZVFSDIR); $(MAKE)
- cd $(ZVFSDIR); $(MAKE) install
+ @echo "ZVFS not needed..."
#--------------------------clean
ds9-saotk.patch:
--- NEW FILE ds9-saotk.patch ---
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
@@ -4,7 +4,7 @@
// this is copied from tkCanvPs.c
-#include "../../tk8.4.17/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
@@ -13,7 +13,7 @@
#include "zlib.h"
extern int DebugGZ;
-#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64)
+#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64) || defined(__LP64__)
#define BIT32 int
#else
#define BIT32 long
ds9-src.patch:
--- NEW FILE ds9-src.patch ---
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
# initialize, depending on how we are running: choices are zvfs, or wish
-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)/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
+
+ package require BLT
+ package require Tktable
+ package require tclxpa
+ package require img::base
+ package require img::jpeg
+ package require img::tiff
+ package require img::png
+ package require img::gif
+ package require img::ppm
+ package require img::bmp
+ package require img::xbm
+ package require img::window
source $ds9(root)/src/source.tcl
Index: ds9.make.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-7/ds9.make.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9.make.fedora 4 Dec 2007 11:39:27 -0000 1.1
+++ ds9.make.fedora 12 Jan 2008 01:30:03 -0000 1.2
@@ -1,5 +1,5 @@
OS = unix
-ARCH = fedoralinux
+ARCH = fedora
#BUILD_SHARED = yes
CC=gcc
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-7/ds9.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds9.spec 8 Dec 2007 23:32:18 -0000 1.2
+++ ds9.spec 12 Jan 2008 01:30:03 -0000 1.3
@@ -1,25 +1,22 @@
Name: ds9
-Version: 5.0
-Release: 6%{?dist}
+Version: 5.1
+Release: 1%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
License: GPLv2+
URL: http://hea-www.harvard.edu/RD/ds9/
-# Tarball with the file FlexLexer.h that has problematic licensing
-#Source0: http://hea-www.harvard.edu/RD/ds9/%{name}.%{version}.tar.gz
-# Create with
-# sh ds9-generate-tarball.sh %{version}
-Source0: %{name}.%{version}-removedflex.tar.gz
+Source0: http://hea-www.harvard.edu/RD/ds9/%{name}.%{version}.tar.gz
Source1: ds9.desktop
Source2: ds9.make.fedora
-# File from the cvs repository
-# cvs -d:pserver:anonymous at flex.cvs.sourceforge.net:/cvsroot/flex login
-# cvs -z3 -d:pserver:anonymous at flex.cvs.sourceforge.net:/cvsroot/flex co -r 1.22 flex/FlexLexer.h
-Source3: FlexLexer.h
-Source4: ds9-generate-tarball.sh
-Patch0: ds9-external.patch
-Patch1: ds9-flex.patch
+Patch0: ds9-main.patch
+Patch1: ds9-fitsy.patch
+Patch2: ds9-frame.patch
+Patch3: ds9-htmlw.patch
+Patch4: ds9-mastermake.patch
+Patch5: ds9-saotk.patch
+Patch6: ds9-src.patch
+
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: zlib-devel funtools-devel
@@ -29,7 +26,6 @@
BuildRequires: emacs-common
BuildRequires: desktop-file-utils
-# Change this
Requires: tcllib tktable tkimg xpa-tcl
%description
@@ -41,9 +37,13 @@
%prep
%setup -q -n saods9
-%{__cp} %{SOURCE3} saotk/util
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
%{__cp} %{SOURCE2} make.include
@@ -79,6 +79,7 @@
%{_datadir}/pixmaps/*
%{_datadir}/%{name}
+
%post
update-desktop-database &> /dev/null || :
@@ -87,6 +88,10 @@
%changelog
+* Tue Jan 08 2008 Sergio Pascual <sergiopr at fedoraproject.org> 5.1-1
+- New upstream source
+- Reorganized patches
+
* Sat Dec 08 2007 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-6
- Fixed problems with TCL package loading
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Dec 2007 11:39:27 -0000 1.2
+++ sources 12 Jan 2008 01:30:03 -0000 1.3
@@ -1 +1 @@
-691491c763cb4fa8c7c88a24dbf8c5f3 ds9.5.0-removedflex.tar.gz
+b835c11c87512d830d2bdccd27ca07f7 ds9.5.1.tar.gz
--- FlexLexer.h DELETED ---
--- ds9-external.patch DELETED ---
--- ds9-flex.patch DELETED ---
--- ds9-generate-tarball.sh DELETED ---
- Previous message (by thread): rpms/anaconda/devel .cvsignore, 1.475, 1.476 anaconda.spec, 1.615, 1.616 sources, 1.607, 1.608
- Next message (by thread): rpms/wine/F-7 .cvsignore, 1.47, 1.48 sources, 1.48, 1.49 wine.spec, 1.67, 1.68
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list