From 9c9b560d31139b118a5b4b7e33f58ff4f3d28b9e Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fedoraproject.org>
Date: Nov 14 2007 16:10:55 +0000
Subject: - New upstream source


---

diff --git a/.cvsignore b/.cvsignore
index 8f12e97..97a4507 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-CCfits-1.7.tar.gz
+CCfits-1.8.tar.gz
diff --git a/CCfits-1.6-includecfitsiopath.patch b/CCfits-1.6-includecfitsiopath.patch
deleted file mode 100644
index 5378737..0000000
--- a/CCfits-1.6-includecfitsiopath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur CCfits.old/CCfits.h CCfits/CCfits.h
---- CCfits.old/CCfits.h	2006-11-03 23:07:28.000000000 +0100
-+++ CCfits/CCfits.h	2007-02-01 11:33:56.000000000 +0100
-@@ -16,7 +16,7 @@
- #define CCFITS_H 1
-
- // fitsio
--#include "fitsio.h"
-+#include <cfitsio/fitsio.h>
- // string
- #include <string>
-
-@@ -26,7 +26,7 @@
- } // namespace CCfits
- #include <map>
- #include <sys/types.h>
--#include "longnam.h"
-+#include <cfitsio/longnam.h>
- #include "float.h"
- 
- 
-diff -ur CCfits.old/FITSBase.h CCfits/FITSBase.h
---- CCfits.old/FITSBase.h	2006-11-03 23:07:28.000000000 +0100
-+++ CCfits/FITSBase.h	2007-02-01 11:34:25.000000000 +0100
-@@ -18,7 +18,7 @@
- // CCfitsHeader
- #include "CCfits.h"
- // fitsio
--#include "fitsio.h"
-+#include <cfitsio/fitsio.h>
- // string
- #include <string>
- // map
diff --git a/CCfits-includecfitsiopath.patch b/CCfits-includecfitsiopath.patch
new file mode 100644
index 0000000..0185d6c
--- /dev/null
+++ b/CCfits-includecfitsiopath.patch
@@ -0,0 +1,35 @@
+diff -ur CCfits/CCfits.h CCfits.new/CCfits.h
+--- CCfits/CCfits.h	2007-10-12 19:32:32.000000000 +0200
++++ CCfits.new/CCfits.h	2007-11-14 16:29:19.000000000 +0100
+@@ -15,7 +15,7 @@
+ // string
+ #include <string>
+ // fitsio
+-#include "fitsio.h"
++#include <cfitsio/fitsio.h>
+ 
+ namespace CCfits {
+   class ExtHDU;
+@@ -23,8 +23,8 @@
+ } // namespace CCfits
+ #include <map>
+ #include <sys/types.h>
+-#include "longnam.h"
+-#include "float.h"
++#include <cfitsio/longnam.h>
++#include <float.h>
+ 
+ 
+ namespace CCfits {
+diff -ur CCfits/FITSBase.h CCfits.new/FITSBase.h
+--- CCfits/FITSBase.h	2007-10-12 19:32:32.000000000 +0200
++++ CCfits.new/FITSBase.h	2007-11-14 16:31:05.000000000 +0100
+@@ -17,7 +17,7 @@
+ // map
+ #include <map>
+ // fitsio
+-#include "fitsio.h"
++#include <cfitsio/fitsio.h>
+ // CCfitsHeader
+ #include "CCfits.h"
+ 
diff --git a/CCfits.spec b/CCfits.spec
index 86ce98d..fa5e0e7 100644
--- a/CCfits.spec
+++ b/CCfits.spec
@@ -1,6 +1,6 @@
 Name: CCfits
-Version: 1.7
-Release: 1%{?dist}.1
+Version: 1.8
+Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
 Group: Development/Libraries
@@ -8,12 +8,10 @@ License: BSD
 URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits
 Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz
 Patch0: CCfits-1.6-removerpath.patch
-Patch1: CCfits-1.6-includecfitsiopath.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: CCfits-includecfitsiopath.patch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel >= 3.020 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 CCfits is an object oriented interface to the cfitsio library. It is designed 
@@ -77,32 +75,46 @@ This package contains the full API documentation for %{name}.
 %doc html
 
 %changelog
+* Wed Nov 13 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.8-1
+- New upstream source
+
 * Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.7-1.1
 - Rebuild for Fedora 8 by bad binutils in ppc32
+
 * Sun Jul 22 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.7-1
 - New upstream source 1.7
+
 * Thu Feb 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.6-2
 - Patch to fix the include directives of cfitsio in header files.
+
 * Mon Dec 11 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.6-1
 - New upstream version 1.6. Only compiles with cfitsio >= 3.020.
+
 * Tue Sep 12 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.5-3
 - Rebuild for FC6.
+
 * Fri Jul 28 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.5-2
 - Removed perl files in the documentation (bug #200517).
+
 * Thu Jul 27 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.5-1
 - New upstream source 1.5.
 - Removed patch CCfits-1.4-g++4.patch (integrated in the source)
 - Perl files in docs removed in the source.
+
 * Wed Mar 08 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-4
 - Removed explicit Buildrequires gcc-c++.
+
 * Tue Mar 07 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-3
 - Rebuilt with new upstream source.
+
 * Mon Mar 06 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-2
 - Removed Source with license file License.txt.
+
 * Mon Feb 20 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-1
 - Removed perl files in documentation.
 - Changed license type to BSD.
 - Main summary changed and trailing dots removed.
 - Removed -rpath in the shared library.
+
 * Thu Feb 16 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4-0
 - Initial spec file.
diff --git a/sources b/sources
index a66a325..b4e4557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7cbddb94d7dd2dec63968a3c1502052  CCfits-1.7.tar.gz
+c20815e92e66f30f16b4cea7127a5304  CCfits-1.8.tar.gz