rpms/funtools/devel funtools-wcs.patch, NONE, 1.1 funtools.spec, 1.7, 1.8

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/funtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21787

Modified Files:
	funtools.spec 
Added Files:
	funtools-wcs.patch 
Log Message:
* Tue Oct 16 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 1.4.0-3
- Fixing wcs headers
* Sat Oct 13 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 1.4.0-2
- Fixing bug #329741
- Splitting libs in funtools-libs
* Mon Aug 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4.0-1
- New upstream version, changed license and buildroot lines
* Sun Jul 22 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.5.b34
- New upstream version
* Thu May 03 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.5.b33
- New upstream version
* Mon Mar 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.4.b29
- Funtools Approved
- Parallel make does not work
- Problem with undefined non weak symbols in libtclfun fixed
* Fri Mar 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.3.b29
- Removed _smp_mflags
* Thu Mar 22 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.2.b29
- Updated funtools-makefile.patch
- Added EXTRA_LIBS to compilation step
* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.1.b29
- Initial spec file


funtools-wcs.patch:

--- NEW FILE funtools-wcs.patch ---
diff -ur funtools-1.4.0/filter/filter.h funtools-1.4.0.new/filter/filter.h
--- funtools-1.4.0/filter/filter.h	2007-01-04 17:54:21.000000000 +0100
+++ funtools-1.4.0.new/filter/filter.h	2007-10-16 09:48:28.000000000 +0200
@@ -46,7 +46,7 @@
 #include <fitsy.h>
 #undef USE_XFILEIO
 #include <idx.h>
-#include <wcs.h>
+#include <wcs/wcs.h>
 #include <column.h>
 #include <tl.h>
 #include <dl.h>
diff -ur funtools-1.4.0/funcen.c funtools-1.4.0.new/funcen.c
--- funtools-1.4.0/funcen.c	2006-11-01 17:35:16.000000000 +0100
+++ funtools-1.4.0.new/funcen.c	2007-10-16 09:48:49.000000000 +0200
@@ -21,7 +21,7 @@
 #include <filter.h>
 #include <swap.h>
 #include <word.h>
-#include <wcs.h>
+#include <wcs/wcs.h>
 #include <xalloc.h>
 
 #define MAXROW 8192
diff -ur funtools-1.4.0/funmerge.c funtools-1.4.0.new/funmerge.c
--- funtools-1.4.0/funmerge.c	2007-03-05 16:42:15.000000000 +0100
+++ funtools-1.4.0.new/funmerge.c	2007-10-16 09:49:07.000000000 +0200
@@ -4,7 +4,7 @@
 
 #include <funtools.h>
 #include <fitsy.h>
-#include <wcs.h>
+#include <wcs/wcs.h>
 #include <gio.h>
 #include <tl.h>
 #include <word.h>
diff -ur funtools-1.4.0/funtools.h funtools-1.4.0.new/funtools.h
--- funtools-1.4.0/funtools.h	2007-08-03 19:12:10.000000000 +0200
+++ funtools-1.4.0.new/funtools.h	2007-10-16 09:48:01.000000000 +0200
@@ -31,7 +31,7 @@
 #define USE_XFILEIO 1
 #include <fitsy.h>
 #undef USE_XFILEIO
-#include <wcs.h>
+#include <wcs/wcs.h>
 typedef void *Fun;
 #endif
 
diff -ur funtools-1.4.0/funtoolsP.h funtools-1.4.0.new/funtoolsP.h
--- funtools-1.4.0/funtoolsP.h	2007-07-31 19:04:49.000000000 +0200
+++ funtools-1.4.0.new/funtoolsP.h	2007-10-16 09:49:23.000000000 +0200
@@ -36,7 +36,7 @@
 #define USE_XFILEIO 1
 #include <fitsy.h>
 #undef USE_XFILEIO
-#include <wcs.h>
+#include <wcs/wcs.h>
 #include <filter.h>
 #include <file.h>
 #include <swap.h>
diff -ur funtools-1.4.0/funwcs.c funtools-1.4.0.new/funwcs.c
--- funtools-1.4.0/funwcs.c	2007-06-11 19:13:06.000000000 +0200
+++ funtools-1.4.0.new/funwcs.c	2007-10-16 09:49:36.000000000 +0200
@@ -3,7 +3,7 @@
  */
 
 #include <funtoolsP.h>
-#include <wcs.h>
+#include <wcs/wcs.h>
 
 /*
  *
diff -ur funtools-1.4.0/ofuntools.h funtools-1.4.0.new/ofuntools.h
--- funtools-1.4.0/ofuntools.h	2007-06-11 23:13:24.000000000 +0200
+++ funtools-1.4.0.new/ofuntools.h	2007-10-16 09:49:49.000000000 +0200
@@ -31,7 +31,7 @@
 #define USE_XFILEIO 1
 #include <fitsy.h>
 #undef USE_XFILEIO
-#include <wcs.h>
+#include <wcs/wcs.h>
 typedef void *Fun;
 #endif
 


Index: funtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/devel/funtools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- funtools.spec	13 Oct 2007 10:20:22 -0000	1.7
+++ funtools.spec	16 Oct 2007 08:15:37 -0000	1.8
@@ -1,6 +1,6 @@
 Name: funtools
 Version: 1.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: FITS library and utilities
 
 # Upstream version
@@ -11,6 +11,7 @@
 URL: http://hea-www.harvard.edu/RD/funtools/
 Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{upversion}.tar.gz
 Patch0: funtools-makefile.patch
+Patch1: funtools-wcs.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: libwcs-devel tcl-devel zlib-devel
@@ -94,6 +95,8 @@
 %{_mandir}/mann/*
 
 %changelog
+* Tue Oct 16 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 1.4.0-3
+- Fixing wcs headers
 * Sat Oct 13 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 1.4.0-2
 - Fixing bug #329741
 - Splitting libs in funtools-libs