rpms/funtools/devel funtools-wcs.patch, 1.1, 1.2 funtools.spec, 1.12, 1.13

[Sergio Pascual]

Author: sergiopr

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

Modified Files:
	funtools-wcs.patch funtools.spec 
Log Message:
* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
- Using wcstools-devel instead of libwcs-devel


funtools-wcs.patch:

Index: funtools-wcs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/devel/funtools-wcs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- funtools-wcs.patch	16 Oct 2007 08:15:37 -0000	1.1
+++ funtools-wcs.patch	14 Feb 2009 16:54:39 -0000	1.2
@@ -6,7 +6,7 @@
  #undef USE_XFILEIO
  #include <idx.h>
 -#include <wcs.h>
-+#include <wcs/wcs.h>
++#include <wcstools/wcs.h>
  #include <column.h>
  #include <tl.h>
  #include <dl.h>
@@ -18,7 +18,7 @@
  #include <swap.h>
  #include <word.h>
 -#include <wcs.h>
-+#include <wcs/wcs.h>
++#include <wcstools/wcs.h>
  #include <xalloc.h>
  
  #define MAXROW 8192
@@ -30,7 +30,7 @@
  #include <funtools.h>
  #include <fitsy.h>
 -#include <wcs.h>
-+#include <wcs/wcs.h>
++#include <wcstools/wcs.h>
  #include <gio.h>
  #include <tl.h>
  #include <word.h>
@@ -42,7 +42,7 @@
  #include <fitsy.h>
  #undef USE_XFILEIO
 -#include <wcs.h>
-+#include <wcs/wcs.h>
++#include <wcstools/wcs.h>
  typedef void *Fun;
  #endif
  
@@ -54,7 +54,7 @@
  #include <fitsy.h>
  #undef USE_XFILEIO
 -#include <wcs.h>
-+#include <wcs/wcs.h>
++#include <wcstools/wcs.h>
  #include <filter.h>
  #include <file.h>
  #include <swap.h>
@@ -66,7 +66,7 @@
  
  #include <funtoolsP.h>
 -#include <wcs.h>
-+#include <wcs/wcs.h>
++#include <wcstools/wcs.h>
  
  /*
   *
@@ -78,7 +78,7 @@
  #include <fitsy.h>
  #undef USE_XFILEIO
 -#include <wcs.h>
-+#include <wcs/wcs.h>
++#include <wcstools/wcs.h>
  typedef void *Fun;
  #endif
  


Index: funtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/devel/funtools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- funtools.spec	19 Feb 2008 23:38:02 -0000	1.12
+++ funtools.spec	14 Feb 2009 16:54:39 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name: funtools
 Version: 1.4.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: FITS library and utilities
 
 # Upstream version
@@ -17,7 +17,7 @@
 Patch1: funtools-wcs.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: libwcs-devel tcl-devel zlib-devel
+BuildRequires: wcstools-devel tcl-devel zlib-devel
 BuildRequires: pkgconfig
 Requires: gnuplot
 Requires: %{name}-libs = %{version}-%{release}
@@ -35,7 +35,7 @@
 %package devel
 Summary: Headers for developing programs that will use %{name}
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release} libwcs-devel tcl-devel
+Requires: %{name}-libs = %{version}-%{release} wcstools-devel tcl-devel
 
 %description devel
 These are the header files and libraries needed to develop a %{name} 
@@ -64,11 +64,11 @@
 %patch1 -p1
 
 %build
-%configure --enable-shared=link --with-wcslib=%{_libdir}/libwcs.so \
+%configure --enable-shared=link --with-wcslib=%{_libdir}/libwcstools.so \
         --with-zlib=%{_libdir}/libz.so --with-tcl=%{_libdir} --enable-dl
 # Parallel build does not work currently
-%{__make} EXTRA_LIBS="-lwcs -lz -ldl"
-%{__make} shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
+%{__make} EXTRA_LIBS="-lwcstools -lz -ldl"
+%{__make} shtclfun EXTRA_LIBS="-ltcl -lwcstools -lz -ldl"
 
 %install
 %{__rm} -fr %{buildroot}
@@ -118,6 +118,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Fri Feb 13 2009 Sergio Pascual  <sergiopr at fedoraproject.org> - 1.4.0-8
+- Using wcstools-devel instead of libwcs-devel
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.0-7
 - Autorebuild for GCC 4.3