rpms/CCfits/devel .cvsignore, 1.7, 1.8 CCfits-includecfitsiopath.patch, 1.2, 1.3 CCfits.spec, 1.13, 1.14 sources, 1.7, 1.8

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/CCfits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18544

Modified Files:
	.cvsignore CCfits-includecfitsiopath.patch CCfits.spec sources 
Log Message:
* Wed Dec 03 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.1-1
- New upstream source
- Rebuilt needed to fix bz #474087



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Feb 2008 11:14:53 -0000	1.7
+++ .cvsignore	3 Dec 2008 15:01:43 -0000	1.8
@@ -1 +1,2 @@
 CCfits-2.0.tar.gz
+CCfits-2.1.tar.gz

CCfits-includecfitsiopath.patch:

Index: CCfits-includecfitsiopath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits-includecfitsiopath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CCfits-includecfitsiopath.patch	9 Feb 2008 11:14:53 -0000	1.2
+++ CCfits-includecfitsiopath.patch	3 Dec 2008 15:01:43 -0000	1.3
@@ -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 @@
  // 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


Index: CCfits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/CCfits.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CCfits.spec	9 Feb 2008 11:14:53 -0000	1.13
+++ CCfits.spec	3 Dec 2008 15:01:43 -0000	1.14
@@ -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 @@
 %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 @@
 %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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CCfits/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Feb 2008 11:14:53 -0000	1.7
+++ sources	3 Dec 2008 15:01:43 -0000	1.8
@@ -1 +1,2 @@
 bb049a22f9ff50ef983633dd270f5dbd  CCfits-2.0.tar.gz
+5ce1135efe2bfcbf7b94e10d1d483c71  CCfits-2.1.tar.gz