rpms/CCfits/F-7 CCfits-includecfitsiopath.patch, NONE, 1.1 CCfits.spec, 1.10, 1.11 sources, 1.5, 1.6 CCfits-1.6-includecfitsiopath.patch, 1.2, NONE

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/CCfits/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2820

Modified Files:
	CCfits.spec sources 
Added Files:
	CCfits-includecfitsiopath.patch 
Removed Files:
	CCfits-1.6-includecfitsiopath.patch 
Log Message:
* Wed Nov 13 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.8-1
- New upstream source


CCfits-includecfitsiopath.patch:

--- NEW FILE CCfits-includecfitsiopath.patch ---
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"
 


Index: CCfits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/F-7/CCfits.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CCfits.spec	23 Jul 2007 08:11:42 -0000	1.10
+++ CCfits.spec	14 Nov 2007 17:06:24 -0000	1.11
@@ -1,5 +1,5 @@
 Name: CCfits
-Version: 1.7
+Version: 1.8
 Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
@@ -8,12 +8,10 @@
 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,30 +75,43 @@
 %doc html
 
 %changelog
+* Wed Nov 13 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.8-1
+- New upstream source
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jul 2007 08:11:42 -0000	1.5
+++ sources	14 Nov 2007 17:06:24 -0000	1.6
@@ -1 +1 @@
-f7cbddb94d7dd2dec63968a3c1502052  CCfits-1.7.tar.gz
+c20815e92e66f30f16b4cea7127a5304  CCfits-1.8.tar.gz


--- CCfits-1.6-includecfitsiopath.patch DELETED ---