rpms/ds9/EL-5 ds9-tkcon.patch, 1.2, 1.3 ds9.README.fedora, 1.2, 1.3 ds9.spec, 1.14, 1.15 ds9-gcc43.patch, 1.3, NONE ds9-tcl85.patch, 1.2, NONE

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/ds9/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15659

Modified Files:
	ds9.spec 
Added Files:
	ds9-tkcon.patch ds9.README.fedora 
Removed Files:
	ds9-gcc43.patch ds9-tcl85.patch 
Log Message:
Importing from F-8


ds9-tkcon.patch:

Index: ds9-tkcon.patch
===================================================================
RCS file: ds9-tkcon.patch
diff -N ds9-tkcon.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ds9-tkcon.patch	17 Jul 2008 11:10:03 -0000	1.3
@@ -0,0 +1,33 @@
+diff -ur saods9/src/ds9.tcl saods9.tkcon/src/ds9.tcl
+--- saods9/src/ds9.tcl	2008-05-30 09:11:53.000000000 +0200
++++ saods9.tkcon/src/ds9.tcl	2008-05-30 09:13:57.000000000 +0200
+@@ -82,7 +82,7 @@
+     package require textutil::repeat
+     package require textutil::tabify
+ 
+-    package require tkcon
++#    package require tkcon
+ 
+     package require BLT
+     package require Tktable
+diff -ur saods9/src/mfile.tcl saods9.tkcon/src/mfile.tcl
+--- saods9/src/mfile.tcl	2008-04-01 23:41:09.000000000 +0200
++++ saods9.tkcon/src/mfile.tcl	2008-05-30 09:13:24.000000000 +0200
+@@ -40,7 +40,7 @@
+     $ds9(mb).file add separator
+     $ds9(mb).file add command -label "[msgcat::mc {XPA Information}]..." \
+ 	-command DisplayXPAInfo
+-    $ds9(mb).file add command -label "[msgcat::mc {Open TCL Console}]..." \
++#    $ds9(mb).file add command -label "[msgcat::mc {Open TCL Console}]..." \
+ 	-command OpenConsole
+     $ds9(mb).file add command -label "[msgcat::mc {Source TCL}]..." \
+ 	-command OpenSource
+@@ -238,7 +238,7 @@
+     $m add separator
+     $m add checkbutton -label "[msgcat::mc {XPA Information}]..." \
+ 	-variable buttons(file,xpa) -command {UpdateButtons buttons(file)}
+-    $m add checkbutton -label "[msgcat::mc {Open TCL Console}]..." \
++#    $m add checkbutton -label "[msgcat::mc {Open TCL Console}]..." \
+ 	-variable buttons(file,console) -command {UpdateButtons buttons(file)}
+     $m add checkbutton -label "[msgcat::mc {Source TCL}]..." \
+ 	-variable buttons(file,tcl) -command {UpdateButtons buttons(file)}


Index: ds9.README.fedora
===================================================================
RCS file: ds9.README.fedora
diff -N ds9.README.fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ds9.README.fedora	17 Jul 2008 11:10:03 -0000	1.3
@@ -0,0 +1 @@
+Version 5.2 of fedora ds9 doesn't include tkcon. Version 2.5 of tkcon is required and only 2.4 is included currently in fedora


Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/EL-5/ds9.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ds9.spec	12 Jun 2008 04:35:48 -0000	1.14
+++ ds9.spec	17 Jul 2008 11:10:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name: ds9
 Version: 5.2
-Release: 4%{?dist}
+Release: 3%{?dist}
 Summary: Astronomical Data Visualization Application
 
 Group: Applications/Engineering
@@ -9,6 +9,7 @@
 Source0: http://hea-www.harvard.edu/RD/ds9/%{name}.%{version}.tar.gz
 Source1: ds9.desktop
 Source2: ds9.make.fedora
+Source3: ds9.README.fedora
 Patch0: ds9-main.patch
 Patch1: ds9-fitsy.patch
 Patch2: ds9-frame.patch
@@ -16,9 +17,8 @@
 Patch4: ds9-mastermake.patch
 Patch5: ds9-saotk.patch
 Patch6: ds9-src.patch
-Patch7: ds9-tcl85.patch
-Patch8: ds9-gcc43.patch
-Patch9: ds9-notags.patch
+Patch7: ds9-tkcon.patch
+Patch8: ds9-notags.patch
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -27,7 +27,7 @@
 
 BuildRequires: desktop-file-utils
 
-Requires: tcllib tktable tkimg xpa-tcl tkcon >= 2.5
+Requires: tcllib tktable tkimg xpa-tcl
 
 %description
 SAOImage DS9 is an astronomical imaging and data visualization application. 
@@ -47,13 +47,14 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
+
 
 %build
 %{__cp} %{SOURCE2} make.include
 echo LIBDIR="%{_libdir}" >> make.include
 echo OPTS="%{optflags}" >> make.include
 %{__make} %{_smp_mflags}
+%{__cp} %{SOURCE3} README.fedora
 
 %install
 %{__rm} -fr %{buildroot}
@@ -76,7 +77,7 @@
 %{__rm} -fr %{buildroot}
 
 %files
-%doc COPYING copyright 
+%doc COPYING copyright README.fedora
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/applications/*
@@ -92,12 +93,10 @@
 
 
 %changelog
-* Wed Jun 11 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-4
+* Sat Jun 28 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-3
+- Tkcon support removed
 - 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
 - Updated gcc 4.3 patch
 


--- ds9-gcc43.patch DELETED ---


--- ds9-tcl85.patch DELETED ---