rpms/funtools/FC-6 funtools-wcs.patch, NONE, 1.1 funtools.spec, 1.3, 1.4 sources, 1.4, 1.5

Tue Oct 16 08:27:22 UTC 2007

Author: sergiopr

Update of /cvs/pkgs/rpms/funtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22359

Modified Files:
	funtools.spec sources 
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/FC-6/funtools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- funtools.spec	22 Jul 2007 11:31:51 -0000	1.3
+++ funtools.spec	16 Oct 2007 08:26:49 -0000	1.4
@@ -1,23 +1,23 @@
 Name: funtools
-Version: 1.3.0
-Release: 0.5.b34%{?dist}
+Version: 1.4.0
+Release: 3%{?dist}
 Summary: FITS library and utilities
 
 # Upstream version
-%define upversion 1.3.0b34
+%define upversion 1.4.0
 
-Group: Development/Libraries
-License: LGPL
+Group: Applications/Engineering
+License: LGPLv2+
 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
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: funtools-wcs.patch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: libwcs-devel tcl-devel zlib-devel
+BuildRequires: pkgconfig
 Requires: gnuplot
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 Funtools, is a "minimal buy-in" FITS library and utility package from 
@@ -25,16 +25,25 @@
 FITS images and binary tables, as well as to raw array and binary event lists. 
 The Funtools utilities provide high-level support for processing 
 astronomical data.
+This package contains command-line utilities for managing FITS files.
 
 %package devel
 Summary: Headers for developing programs that will use %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 These are the header files and libraries needed to develop a %{name} 
 application.
 
+%package libs
+Summary: A general purpose FITS library
+Group: System Environment/Libraries
+%description libs
+qfits is a stand-alone C library offering easy access to FITS (Flexible Image
+ Transport System) files.
+This package contains the %{name} run-time library
+
 %prep
 %setup -q -n %{name}-%{upversion}
 %patch0 -p1
@@ -48,27 +57,34 @@
 
 %install
 %{__rm} -fr %{buildroot}
-%{__make} INSTALL_ROOT=%{buildroot} install
+%{__make} INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
 mv %{buildroot}/%{_bindir}/funtools.ds9 %{buildroot}/%{_datadir}/funtools
 mv %{buildroot}/%{_bindir}/funcalc.sed %{buildroot}/%{_datadir}/funtools
+# Bug #329741
+%{__install} -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
 
 
 %clean
 %{__rm} -fr %{buildroot}
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
+%defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/*
-%{_libdir}/*so.*
 %{_mandir}/man1/*
 %{_datadir}/%{name}
 
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/*so.*
+
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*.html
 %doc doc/*.pdf
 %{_libdir}/*.so
@@ -79,6 +95,13 @@
 %{_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
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/funtools/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jul 2007 11:31:51 -0000	1.4
+++ sources	16 Oct 2007 08:26:49 -0000	1.5
@@ -1 +1 @@
-d780203ca90857244beb35e572ab8217  funtools-1.3.0b34.tar.gz
+8079d723e1424141c3f2bc4ea9b323db  funtools-1.4.0.tar.gz


