rpms/ds9/devel ds9-external.patch, 1.1, 1.2 ds9.spec, 1.1, 1.2 ds9-tcllib.patch, 1.1, NONE
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Tue Dec 4 09:51:07 UTC 2007
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19584/devel
Modified Files:
ds9-external.patch ds9.spec
Removed Files:
ds9-tcllib.patch
Log Message:
Reverting tcllib patch
ds9-external.patch:
Index: ds9-external.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-external.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-external.patch 3 Dec 2007 20:22:08 -0000 1.1
+++ ds9-external.patch 4 Dec 2007 09:51:03 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ur saods9/ds9/ds9.C saods9-5/ds9/ds9.C
---- saods9/ds9/ds9.C 2007-06-19 19:13:04.000000000 +0200
-+++ saods9-5/ds9/ds9.C 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C
+--- saods9.orig/ds9/ds9.C 2007-06-19 19:13:04.000000000 +0200
++++ saods9/ds9/ds9.C 2007-12-04 10:19:19.000000000 +0100
@@ -10,8 +10,8 @@
void TclSetStartupScriptFileName(const char*);
@@ -247,9 +247,9 @@
//Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY);
-diff -ur saods9/ds9/Makefile saods9-5/ds9/Makefile
---- saods9/ds9/Makefile 2007-10-02 22:39:33.000000000 +0200
-+++ saods9-5/ds9/Makefile 2007-11-13 11:12:50.000000000 +0100
+diff -ur saods9.orig/ds9/Makefile saods9/ds9/Makefile
+--- saods9.orig/ds9/Makefile 2007-10-02 22:39:33.000000000 +0200
++++ saods9/ds9/Makefile 2007-12-04 10:19:19.000000000 +0100
@@ -4,45 +4,20 @@
#--------------------------defines
@@ -333,7 +333,7 @@
+ds9Base : $(OBJS) $(LIBS)
+ echo $(CUSTOMLIBDIR)
+ $(RM) $@
-+ $(CXX) ${OPTS} -DLIBDIR=\"${LIBDIR}\" \
++ $(CXX) ${OPTS} \
+ -o $@ $(OBJS) \
+ -L$(X11LIB) -lX11 \
+ -ldl -lpthread \
@@ -345,9 +345,9 @@
#--------------------------solaris
ifeq ($(ARCH),solaris)
-diff -ur saods9/htmlwidget/configure saods9-5/htmlwidget/configure
---- saods9/htmlwidget/configure 2006-05-01 19:47:09.000000000 +0200
-+++ saods9-5/htmlwidget/configure 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/htmlwidget/configure saods9/htmlwidget/configure
+--- saods9.orig/htmlwidget/configure 2006-05-01 19:47:09.000000000 +0200
++++ saods9/htmlwidget/configure 2007-12-04 10:19:19.000000000 +0100
@@ -1052,11 +1052,11 @@
echo "$ac_t""$BUILD_TCLSH" 1>&6
else
@@ -382,9 +382,9 @@
fi
CC=$TARGET_CC
echo $ac_n "checking for sin""... $ac_c" 1>&6
-diff -ur saods9/Makefile saods9-5/Makefile
---- saods9/Makefile 2007-10-10 18:35:24.000000000 +0200
-+++ saods9-5/Makefile 2007-11-13 11:16:33.000000000 +0100
+diff -ur saods9.orig/Makefile saods9/Makefile
+--- saods9.orig/Makefile 2007-10-10 18:35:24.000000000 +0200
++++ saods9/Makefile 2007-12-04 10:19:19.000000000 +0100
@@ -43,8 +43,8 @@
XPAFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
$(XFLAGS)
@@ -617,9 +617,9 @@
#--------------------------cvs
-diff -ur saods9/saotk/fitsy++/Makefile saods9-5/saotk/fitsy++/Makefile
---- saods9/saotk/fitsy++/Makefile 2007-04-19 00:28:04.000000000 +0200
-+++ saods9-5/saotk/fitsy++/Makefile 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/saotk/fitsy++/Makefile saods9/saotk/fitsy++/Makefile
+--- saods9.orig/saotk/fitsy++/Makefile 2007-04-19 00:28:04.000000000 +0200
++++ saods9/saotk/fitsy++/Makefile 2007-12-04 10:19:19.000000000 +0100
@@ -3,8 +3,8 @@
CXXFLAGS = $(CXXOPT) -I. -I.. -I../vector -I../util \
@@ -631,9 +631,9 @@
SS = \
alloc.C \
-diff -ur saods9/saotk/frame/fitsimage.C saods9-5/saotk/frame/fitsimage.C
---- saods9/saotk/frame/fitsimage.C 2007-05-22 20:36:50.000000000 +0200
-+++ saods9-5/saotk/frame/fitsimage.C 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/saotk/frame/fitsimage.C saods9/saotk/frame/fitsimage.C
+--- saods9.orig/saotk/frame/fitsimage.C 2007-05-22 20:36:50.000000000 +0200
++++ saods9/saotk/frame/fitsimage.C 2007-12-04 10:19:19.000000000 +0100
@@ -31,7 +31,99 @@
// this is kluge to speed up doug minks wcssubs 'ksearch' routine
extern "C" {
@@ -735,9 +735,9 @@
char* findit(char* cards, char* key)
{
-diff -ur saods9/saotk/frame/fitsimage.h saods9-5/saotk/frame/fitsimage.h
---- saods9/saotk/frame/fitsimage.h 2007-05-18 22:06:56.000000000 +0200
-+++ saods9-5/saotk/frame/fitsimage.h 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/saotk/frame/fitsimage.h saods9/saotk/frame/fitsimage.h
+--- saods9.orig/saotk/frame/fitsimage.h 2007-05-18 22:06:56.000000000 +0200
++++ saods9/saotk/frame/fitsimage.h 2007-12-04 10:19:19.000000000 +0100
@@ -9,7 +9,7 @@
#include "fitsdata.h"
#include "coord.h"
@@ -747,9 +747,9 @@
class FrameBase;
-diff -ur saods9/saotk/frame/Makefile saods9-5/saotk/frame/Makefile
---- saods9/saotk/frame/Makefile 2007-03-16 22:34:32.000000000 +0100
-+++ saods9-5/saotk/frame/Makefile 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/saotk/frame/Makefile saods9/saotk/frame/Makefile
+--- saods9.orig/saotk/frame/Makefile 2007-03-16 22:34:32.000000000 +0100
++++ saods9/saotk/frame/Makefile 2007-12-04 10:19:19.000000000 +0100
@@ -4,7 +4,7 @@
CXXFLAGS = $(CXXOPT) -w \
-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
@@ -759,9 +759,9 @@
-I../../$(ASTDIR)
SS = \
-diff -ur saods9/saotk/Makefile saods9-5/saotk/Makefile
---- saods9/saotk/Makefile 2007-04-19 00:28:04.000000000 +0200
-+++ saods9-5/saotk/Makefile 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/saotk/Makefile saods9/saotk/Makefile
+--- saods9.orig/saotk/Makefile 2007-04-19 00:28:04.000000000 +0200
++++ saods9/saotk/Makefile 2007-12-04 10:19:19.000000000 +0100
@@ -19,15 +19,10 @@
list/*.o \
fitsy++/*.o \
@@ -779,9 +779,9 @@
LIB = libsaotk.a
SHARED = libsaotk.so
-diff -ur saods9/saotk/util/tkpostscript.h saods9-5/saotk/util/tkpostscript.h
---- saods9/saotk/util/tkpostscript.h 2007-01-08 22:14:08.000000000 +0100
-+++ saods9-5/saotk/util/tkpostscript.h 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/saotk/util/tkpostscript.h saods9/saotk/util/tkpostscript.h
+--- saods9.orig/saotk/util/tkpostscript.h 2007-01-08 22:14:08.000000000 +0100
++++ saods9/saotk/util/tkpostscript.h 2007-12-04 10:19:19.000000000 +0100
@@ -4,7 +4,7 @@
// this is copied from tkCanvPs.c
@@ -791,9 +791,9 @@
typedef struct TkPostscriptInfo {
int x, y, width, height; /* Area to print, in canvas pixel
-diff -ur saods9/saotk/widget/ps.h saods9-5/saotk/widget/ps.h
---- saods9/saotk/widget/ps.h 2007-01-08 22:14:08.000000000 +0100
-+++ saods9-5/saotk/widget/ps.h 2007-11-13 10:40:12.000000000 +0100
+diff -ur saods9.orig/saotk/widget/ps.h saods9/saotk/widget/ps.h
+--- saods9.orig/saotk/widget/ps.h 2007-01-08 22:14:08.000000000 +0100
++++ saods9/saotk/widget/ps.h 2007-12-04 10:19:19.000000000 +0100
@@ -13,7 +13,7 @@
#include "zlib.h"
extern int DebugGZ;
@@ -803,9 +803,9 @@
#define BIT32 int
#else
#define BIT32 long
-diff -ur saods9/src/ds9.tcl saods9-5/src/ds9.tcl
---- saods9/src/ds9.tcl 2007-10-02 23:46:26.000000000 +0200
-+++ saods9-5/src/ds9.tcl 2007-11-13 11:18:46.000000000 +0100
+diff -ur saods9.orig/src/ds9.tcl saods9/src/ds9.tcl
+--- saods9.orig/src/ds9.tcl 2007-10-02 23:46:26.000000000 +0200
++++ saods9/src/ds9.tcl 2007-12-04 10:23:06.000000000 +0100
@@ -62,19 +62,19 @@
set env(XPA_VERBOSITY) 0
@@ -817,8 +817,8 @@
- source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl
- source $ds9(root)/tcl8.4/http2.5/http.tcl
-+ source /usr/share/tcl8.4/msgcat1.3/msgcat.tcl
-+ source /usr/share/tcl8.4/http2.5/http.tcl
++ package require msgcat
++ package require http
- source $ds9(root)/tcllib1.9/base64/base64.tcl
- source $ds9(root)/tcllib1.9/log/log.tcl
@@ -827,14 +827,13 @@
- source $ds9(root)/tcllib1.9/textutil/tabify.tcl
- source $ds9(root)/blt2.4/graph.tcl
- source $ds9(root)/blt2.4/tabset.tcl
-+ source /usr/share/tcl8.4/tcllib-1.9/base64/base64.tcl
-+ source /usr/share/tcl8.4/tcllib-1.9/log/log.tcl
-+ source /usr/share/tcl8.4/tcllib-1.9/ftp/ftp.tcl
-+ source /usr/share/tcl8.4/tcllib-1.9/textutil/repeat.tcl
-+ source /usr/share/tcl8.4/tcllib-1.9/textutil/tabify.tcl
++ package require base64
++ package require log
++ package require ftp
++ package require textutil::repeat
++ package require textutil::tabify
+ source $blt_library/graph.tcl
+ source $blt_library/tabset.tcl
source $ds9(root)/src/source.tcl
-Sólo en saods9-5/src: .ds9.tcl.swp
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9.spec 3 Dec 2007 20:22:08 -0000 1.1
+++ ds9.spec 4 Dec 2007 09:51:03 -0000 1.2
@@ -1,6 +1,6 @@
Name: ds9
Version: 5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
@@ -20,7 +20,6 @@
Source4: ds9-generate-tarball.sh
Patch0: ds9-external.patch
Patch1: ds9-flex.patch
-Patch2: ds9-tcllib.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: zlib-devel libwcs-devel funtools-devel
@@ -28,12 +27,7 @@
BuildRequires: emacs-common
BuildRequires: desktop-file-utils
-# This specific version of tcllib s needed as the version number is harcoded
-# in the tcllib installation directory
-%define tcllibver 1.10
-
-Requires: tcllib = %{tcllibver} tktable tkimg xpa-libs
-
+Requires: tcllib tktable tkimg xpa-libs
%description
SAOImage DS9 is an astronomical imaging and data visualization application.
@@ -47,7 +41,6 @@
%{__cp} %{SOURCE3} saotk/util
%patch0 -p1
%patch1 -p1
-%patch2 -p1
# To be sure we are using the native libs
%{__rm} -rf zlib-*
%{__rm} -rf xpa-*
@@ -65,8 +58,6 @@
%build
%{__cp} %{SOURCE2} make.include
echo LIBDIR="%{_libdir}" >> make.include
-echo DATADIR="%{_datadir}" >> make.include
-echo TCLLIB_VERSION="%{tcllibver}" >> make.include
echo OPTS="%{optflags}" >> make.include
%{__make} %{_smp_mflags}
@@ -106,6 +97,9 @@
%changelog
+* Tue Dec 04 2007 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-5
+- Reverting tcllib patch, using package require instead
+
* Mon Dec 03 2007 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-4
- Patch to use the correct version of tcllib
--- ds9-tcllib.patch DELETED ---
More information about the fedora-extras-commits
mailing list