diff --git a/.cvsignore b/.cvsignore index a128bdd..93c1ded 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cfitsio3060.tar.gz +cfitsio3100.tar.gz diff --git a/cfitsio.patch b/cfitsio.patch index 4be598b..6731238 100644 --- a/cfitsio.patch +++ b/cfitsio.patch @@ -1,7 +1,7 @@ -diff -u cfitsio/configure cfitsio-new/configure ---- cfitsio/configure 2005-07-28 17:26:13.000000000 -0400 -+++ cfitsio-new/configure 2005-11-13 14:36:39.000000000 -0500 -@@ -1251,7 +1251,8 @@ +diff -u cfitsio/configure cfitsio-fixed/configure +--- cfitsio/configure 2007-11-05 15:52:57.000000000 -0500 ++++ cfitsio-fixed/configure 2008-09-19 18:50:51.000000000 -0400 +@@ -3397,7 +3397,8 @@ SHLIB_SUFFIX=".sl" ;; lnx) @@ -11,7 +11,7 @@ diff -u cfitsio/configure cfitsio-new/configure ;; osf) SHLIB_LD="ld -shared -expect_unresolved '*'" -@@ -1271,7 +1272,7 @@ +@@ -3418,7 +3419,7 @@ # Darwin uses gcc (=cc), but needs different flags (see above) # if test "x$GCC" = xyes; then if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then @@ -20,17 +20,17 @@ diff -u cfitsio/configure cfitsio-new/configure lhea_shlib_cflags='-fPIC' fi if test "x$lhea_shlib_cflags" != x; then -diff -u old/Makefile.in new/Makefile.in ---- old/Makefile.in 2006-10-12 17:14:41.000000000 -0400 -+++ new/Makefile.in 2006-12-05 16:36:24.000000000 -0500 -@@ -21,8 +21,8 @@ - prefix = @prefix@ +diff -u cfitsio/Makefile.in cfitsio-fixed/Makefile.in +--- cfitsio/Makefile.in 2008-01-14 13:30:51.000000000 -0500 ++++ cfitsio-fixed/Makefile.in 2008-09-19 18:51:41.000000000 -0400 +@@ -22,8 +22,8 @@ exec_prefix = @exec_prefix@ + DESTDIR = CFITSIO_PREFIX = $(prefix) --CFITSIO_LIB = $(exec_prefix)/lib --CFITSIO_INCLUDE = $(prefix)/include -+CFITSIO_LIB = $(exec_prefix)/$(LIBDIR) -+CFITSIO_INCLUDE = $(prefix)/$(INCLUDEDIR) - INSTALL_DIRS = @INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE} +-CFITSIO_LIB = $(DESTDIR)$(exec_prefix)/lib +-CFITSIO_INCLUDE = $(DESTDIR)$(prefix)/include ++CFITSIO_LIB = $(DESTDIR)$(exec_prefix)/$(LIBDIR) ++CFITSIO_INCLUDE = $(DESTDIR)$(prefix)/$(INCLUDEDIR) + INSTALL_DIRS = $(DESTDIR)@INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE} diff --git a/cfitsio.spec b/cfitsio.spec index b3d6635..a2d3183 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,12 +1,12 @@ Name: cfitsio -Version: 3.060 -Release: 3%{?dist} +Version: 3.100 +Release: 1%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries License: GPLv2+ URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html -Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3060.tar.gz +Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3100.tar.gz Patch: cfitsio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,10 @@ rm -rf %{buildroot} %{_libdir}/libcfitsio.a %changelog +* Fri Sep 19 2008 Matthew Truch - 3.100-1 +- Update to 3.100 upstream. + Includes bugfixes and new compression scheme. + * Fri Mar 7 2008 Matthew Truch - 3.060-3 - Properly indicated include and lib directories in .pc file (BZ 436539) diff --git a/sources b/sources index 0dd9fd0..d43b376 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7ab291d227c60b17a19a1c028dc649c cfitsio3060.tar.gz +3a4893c92f485d2d1c6cda10e49d2dcf cfitsio3100.tar.gz