rpms/ds9/devel ds9-fitsy.patch, 1.2, 1.3 ds9-frame.patch, 1.3, 1.4 ds9-main.patch, 1.4, 1.5 ds9-tcl85.patch, 1.4, 1.5 ds9.spec, 1.17, 1.18

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/ds9/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20440

Modified Files:
	ds9-fitsy.patch ds9-frame.patch ds9-main.patch ds9-tcl85.patch 
	ds9.spec 
Log Message:
* Thu Feb 19 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 5.4-4
- Reverting changes to follow wcstools changes


ds9-fitsy.patch:

Index: ds9-fitsy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-fitsy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds9-fitsy.patch	14 Feb 2009 17:25:48 -0000	1.2
+++ ds9-fitsy.patch	19 Feb 2009 11:17:38 -0000	1.3
@@ -8,7 +8,7 @@
 -	-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/wcstools
++	-I/usr/include/funtools/util -I/usr/include/wcs
  
  SS	= \
  	alloc.C \

ds9-frame.patch:

Index: ds9-frame.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-frame.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds9-frame.patch	14 Feb 2009 17:25:48 -0000	1.3
+++ ds9-frame.patch	19 Feb 2009 11:17:38 -0000	1.4
@@ -110,7 +110,7 @@
  	-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/wcstools\
++	-I/usr/include/funtools/util -I/usr/include/blt -I/usr/include/wcs\
  	-I../../$(ASTDIR)
  
  SS	= \

ds9-main.patch:

Index: ds9-main.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-main.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ds9-main.patch	14 Feb 2009 17:25:48 -0000	1.4
+++ ds9-main.patch	19 Feb 2009 11:17:38 -0000	1.5
@@ -225,7 +225,7 @@
 +	-L$(X11LIB) -lX11 \
 +	-ldl -lpthread \
 +	-ltk -ltcl -L${LIBDIR}/blt2.4 -lBLT24 \
-+	-lfuntools -lwcstools -lz
++	-lfuntools -lwcs -lz
 +endif
 +
 +

ds9-tcl85.patch:

Index: ds9-tcl85.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-tcl85.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ds9-tcl85.patch	14 Feb 2009 17:25:48 -0000	1.4
+++ ds9-tcl85.patch	19 Feb 2009 11:17:38 -0000	1.5
@@ -30,7 +30,7 @@
 @@ -5,6 +5,7 @@
  	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
  	-I../../include -I$(X11INCLUDE) \
- 	-I/usr/include/funtools/util -I/usr/include/blt -I/usr/include/wcstools\
+ 	-I/usr/include/funtools/util -I/usr/include/blt -I/usr/include/wcs\
 +	-I/usr/include/tk-private/unix\
  	-I../../$(ASTDIR)
  


Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ds9.spec	14 Feb 2009 17:25:48 -0000	1.17
+++ ds9.spec	19 Feb 2009 11:17:38 -0000	1.18
@@ -1,6 +1,6 @@
 Name: ds9
 Version: 5.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Astronomical Data Visualization Application
 
 Group: Applications/Engineering
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Thu Feb 19 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 5.4-4
+- Reverting changes to follow wcstools changes
+
 * Sat Feb 14 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 5.4-3
 - Rebuilding for wcstools-devel