[cfitsio] - Update to 3.300 beta - Drop s390 patch applied upstream - Rebase makefile and zlib patches

[Orion Poplawski]

commit 7701fb5c33829f324d78cd3f00afd609276e3338
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Apr 13 10:28:42 2012 -0600

    - Update to 3.300 beta
    - Drop s390 patch applied upstream
    - Rebase makefile and zlib patches

 .gitignore         |    1 +
 cfitsio-s390.patch |   18 ------------------
 cfitsio-zlib.patch |   10 +++-------
 cfitsio.spec       |   13 ++++++++-----
 makefile.patch     |   24 ++++++++++++------------
 sources            |    2 +-
 6 files changed, 25 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 735507b..25c4204 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ cfitsio3250.tar.gz
 /cfitsio3270.tar.gz
 /cfitsio3280.tar.gz
 /cfitsio3290.tar.gz
+/beta_cfitsio3300.tar.gz
diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch
index b17b3c1..20ec73e 100644
--- a/cfitsio-zlib.patch
+++ b/cfitsio-zlib.patch
@@ -1,6 +1,5 @@
-diff -ur cfitsio/cfitsio.pc.in cfitsio.zlib/cfitsio.pc.in
---- cfitsio/cfitsio.pc.in	2011-09-22 22:04:57.000000000 +0200
-+++ cfitsio.zlib/cfitsio.pc.in	2011-12-06 18:01:48.491309113 +0100
+--- cfitsio/cfitsio.pc.in.orig	2012-04-11 14:48:16.000000000 -0600
++++ cfitsio/cfitsio.pc.in	2012-04-13 10:10:54.545363858 -0600
 @@ -1,11 +1,11 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -10,13 +9,10 @@ diff -ur cfitsio/cfitsio.pc.in cfitsio.zlib/cfitsio.pc.in
  
  Name: cfitsio
  Description: FITS File Subroutine Library
--Version: 3.29
+ Version: 3.30
 -Libs: -L${libdir} -lcfitsio @LIBS@
 -Libs.private: -lm
 -Cflags: -I${includedir}
-+Version: 3.290
 +Libs: -L${libdir} -lcfitsio
 +Libs.private: @LIBS@ -lm
 +Cflags: -D_REENTRANT -I${includedir}
-Sólo en cfitsio: cfitsio.pc.in.orig
-Sólo en cfitsio: cfitsio.pc.in.rej
diff --git a/cfitsio.spec b/cfitsio.spec
index c137258..ce5fa81 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,14 +1,13 @@
 Name: cfitsio
-Version: 3.290
-Release: 4%{?dist}
+Version: 3.300
+Release: 0.1.beta%{?dist}
 Summary: Library for manipulating FITS data files
 Group: Development/Libraries
 License: MIT
 URL: http://heasarc.gsfc.nasa.gov/fitsio/
-Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3290.tar.gz
+Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/beta_cfitsio3300.tar.gz
 Patch0: cfitsio.patch
 Patch1: makefile.patch
-Patch2: cfitsio-s390.patch
 Patch3: cfitsio-zlib.patch
 
 BuildRequires:     gcc-gfortran zlib-devel
@@ -76,7 +75,6 @@ compression algorithm.
 %setup -q -n cfitsio
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 # Fixing cfitsio.pc.in
 sed -e 's|3.29|3.290|' -i cfitsio.pc.in 
@@ -142,6 +140,11 @@ cp -p f{,un}pack %{buildroot}%{_bindir}/
 %{_bindir}/funpack
 
 %changelog
+* Fri Apr 13 2012 Orion Poplawski <orion at cora.nwra.com> - 3.300-0.1.beta
+- Update to 3.300 beta
+- Drop s390 patch applied upstream
+- Rebase makefile and zlib patches
+
 * Mon Jan 16 2012 Orion Poplawski <orion at cora.nwra.com> - 3.290-4
 - Drop incluedir mod in package config file (bug #782213)
 
diff --git a/makefile.patch b/makefile.patch
index d630e6c..f3bb3d2 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,12 +1,12 @@
-diff -ur cfitsio/Makefile.in cfitsio.new/Makefile.in
---- cfitsio/Makefile.in	2011-10-29 16:54:43.077132582 +0200
-+++ cfitsio.new/Makefile.in	2011-10-29 16:55:38.648098260 +0200
-@@ -90,7 +90,7 @@
- shared: libcfitsio${SHLIB_SUFFIX}
- 
- libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
--		${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS}
-+		${SHLIB_LD} ${LDFLAGS} ${LIBS} -lm -o $@ ${OBJECTS}
- 
- install:	libcfitsio.a $(INSTALL_DIRS)
- 		@if [ -f libcfitsio.a ]; then \
+diff -up cfitsio/Makefile.in.orig cfitsio/Makefile.in
+--- cfitsio/Makefile.in.orig	2012-04-11 13:55:24.000000000 -0600
++++ cfitsio/Makefile.in	2012-04-13 10:07:54.549874768 -0600
+@@ -87,7 +87,7 @@ libcfitsio.a:	${OBJECTS}
+ shared: libcfitsio${SHLIB_SUFFIX}
+ 
+ libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
+-		${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS}
++		${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm
+ 
+ install:	libcfitsio.a $(INSTALL_DIRS)
+ 		@if [ -f libcfitsio.a ]; then \
diff --git a/sources b/sources
index d2e6ce1..66cee5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0d460c5e314a15fa6905b2096159827  cfitsio3290.tar.gz
+c81d8145992fbc6a07922d79c6bb86fe  beta_cfitsio3300.tar.gz