From a8598ddb3f9b98fc30a93a859394ad9459a7e465 Mon Sep 17 00:00:00 2001
From: Matthew D Truch <matt@truch.net>
Date: Wed, 20 Apr 2011 12:54:59 -0400
Subject: [PATCH] Update to 2.70 upstream bugfix (and feature) release.

---
 .gitignore              |  1 +
 cfitsio-pkgconfig.patch |  4 ++--
 cfitsio.patch           | 16 ++++++++--------
 cfitsio.spec            | 14 ++++++++++----
 sources                 |  2 +-
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4531df1..35329db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cfitsio3250.tar.gz
+/cfitsio3270.tar.gz
diff --git a/cfitsio-pkgconfig.patch b/cfitsio-pkgconfig.patch
index b0fd801..6f96201 100644
--- a/cfitsio-pkgconfig.patch
+++ b/cfitsio-pkgconfig.patch
@@ -5,8 +5,8 @@ diff -ur cfitsio/cfitsio.pc.in cfitsio-pkgconfig/cfitsio.pc.in
  
  Name: cfitsio
  Description: FITS File Subroutine Library
--Version: 3.25
-+Version: 3.250
+-Version: 3.27
++Version: 3.270
  Libs: -L${libdir} -lcfitsio @LIBS@
  Libs.private: -lm
  Cflags: -I${includedir}
diff --git a/cfitsio.patch b/cfitsio.patch
index 344b0dd..05ec403 100644
--- a/cfitsio.patch
+++ b/cfitsio.patch
@@ -1,7 +1,7 @@
-diff -ur cfitsio/configure cfitsio-fixed-configure/configure
---- cfitsio/configure	2010-01-08 13:03:29.000000000 -0500
-+++ cfitsio-fixed-configure/configure	2010-01-27 15:46:34.000000000 -0500
-@@ -4058,7 +4058,8 @@
+diff -ur cfitsio/configure cfitsio-fixed/configure
+--- cfitsio/configure	2011-01-10 12:03:51.000000000 -0500
++++ cfitsio-fixed/configure	2011-04-11 11:33:54.384980620 -0400
+@@ -3778,7 +3778,8 @@
      SHLIB_SUFFIX=".sl"
      ;;
    lnx)
@@ -11,7 +11,7 @@ diff -ur cfitsio/configure cfitsio-fixed-configure/configure
      ;;
    osf)
      SHLIB_LD="ld -shared -expect_unresolved '*'"
-@@ -4079,7 +4080,7 @@
+@@ -3799,7 +3800,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,9 +20,9 @@ diff -ur cfitsio/configure cfitsio-fixed-configure/configure
    lhea_shlib_cflags='-fPIC'
  fi
  if test "x$lhea_shlib_cflags" != x; then
-diff -ur cfitsio/Makefile.in cfitsio-fixed-configure/Makefile.in
---- cfitsio/Makefile.in	2010-01-08 13:03:30.000000000 -0500
-+++ cfitsio-fixed-configure/Makefile.in	2010-01-27 15:46:34.000000000 -0500
+diff -ur cfitsio/Makefile.in cfitsio-fixed/Makefile.in
+--- cfitsio/Makefile.in	2011-01-10 12:04:46.000000000 -0500
++++ cfitsio-fixed/Makefile.in	2011-04-11 11:33:54.385980894 -0400
 @@ -22,8 +22,8 @@
  exec_prefix	= @exec_prefix@
  DESTDIR		= 
diff --git a/cfitsio.spec b/cfitsio.spec
index 19a9b99..50aadab 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,12 +1,12 @@
 Name:           cfitsio
-Version:        3.250
-Release:        6%{?dist}
+Version:        3.270
+Release:        1%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
-License:        GPLv2+
+License:        MIT
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3250.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3270.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         cfitsio.patch
 Patch1:         cfitsio-pkgconfig.patch
@@ -146,6 +146,12 @@ rm -rf %{buildroot}
 %{_bindir}/funpack
 
 %changelog
+* Mon Apr 11 2011 Matthew Truch <matt at truch.net> - 3.270-1
+- Upstream 3.270 release.
+-   Several bugfixes.
+-   A few new library functions.
+-   License change (no longer uses GPL code).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.250-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index ee4483b..ece3300 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e6e390f21fab4e04781156fddcd2f8b  cfitsio3250.tar.gz
+2a72b323de3f40ad1a671f2167500336  cfitsio3270.tar.gz