From ca655aae7d9206bcedbb8a24fbaa18fd7d89eaa6 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fedoraproject.org>
Date: Dec 03 2008 15:01:43 +0000
Subject: - New upstream source

- Rebuilt needed to fix bz #474087

---

diff --git a/.cvsignore b/.cvsignore
index 3b5c91f..afcebb4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 CCfits-2.0.tar.gz
+CCfits-2.1.tar.gz
diff --git a/CCfits-includecfitsiopath.patch b/CCfits-includecfitsiopath.patch
index d6ff684..6140dcd 100644
--- a/CCfits-includecfitsiopath.patch
+++ b/CCfits-includecfitsiopath.patch
@@ -1,6 +1,6 @@
 diff -ur CCfits/CCfits.h CCfits.new/CCfits.h
---- CCfits/CCfits.h	2008-02-05 17:25:12.000000000 +0100
-+++ CCfits.new/CCfits.h	2008-02-09 12:08:52.000000000 +0100
+--- CCfits/CCfits.h	2008-11-06 17:58:34.000000000 +0100
++++ CCfits.new/CCfits.h	2008-12-03 15:53:44.000000000 +0100
 @@ -13,7 +13,7 @@
  #define CCFITS_H 1
  
@@ -10,26 +10,24 @@ diff -ur CCfits/CCfits.h CCfits.new/CCfits.h
  // string
  #include <string>
  
-@@ -23,8 +23,8 @@
+@@ -23,7 +23,7 @@
  } // namespace CCfits
  #include <map>
  #include <sys/types.h>
 -#include "longnam.h"
--#include "float.h"
 +#include <cfitsio/longnam.h>
-+#include <float.h>
+ #include "float.h"
  
  
- namespace CCfits {
 diff -ur CCfits/FITSBase.h CCfits.new/FITSBase.h
---- CCfits/FITSBase.h	2008-02-05 17:25:12.000000000 +0100
-+++ CCfits.new/FITSBase.h	2008-02-09 12:08:56.000000000 +0100
-@@ -15,7 +15,7 @@
- // map
- #include <map>
+--- CCfits/FITSBase.h	2008-11-06 17:58:34.000000000 +0100
++++ CCfits.new/FITSBase.h	2008-12-03 15:53:44.000000000 +0100
+@@ -13,7 +13,7 @@
+ #define FITSBASE_H 1
+ 
  // fitsio
 -#include "fitsio.h"
 +#include <cfitsio/fitsio.h>
+ // map
+ #include <map>
  // string
- #include <string>
- // CCfitsHeader
diff --git a/CCfits.spec b/CCfits.spec
index 6e279b9..bc716c3 100644
--- a/CCfits.spec
+++ b/CCfits.spec
@@ -1,5 +1,5 @@
 Name: CCfits
-Version: 2.0
+Version: 2.1
 Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
@@ -39,6 +39,8 @@ This package contains the full API documentation for %{name}.
 %setup -q -n CCfits
 %patch0 -p1
 %patch1 -p1
+#%{__sed} -e 's|#include "fitsio.h"|#include <cfitsio/fitsio.h>|g' -i CCfits.h FITSBase.h
+#%{__sed} -e 's|#include "longnam.h"|#include <cfitsio/longnam.h>|g' -i CCfits.h FITSBase.h
 # Remove perl files in html docs
 %{__rm} -rf %{_builddir}/%{name}/html/*.pl
 
@@ -75,6 +77,10 @@ This package contains the full API documentation for %{name}.
 %doc html
 
 %changelog
+* Wed Dec 03 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.1-1
+- New upstream source
+- Rebuilt needed to fix bz #474087
+
 * Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.0-1
 - New upstream source
 
diff --git a/sources b/sources
index eec0969..1e13311 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 bb049a22f9ff50ef983633dd270f5dbd  CCfits-2.0.tar.gz
+5ce1135efe2bfcbf7b94e10d1d483c71  CCfits-2.1.tar.gz