rpms/CCfits/FC-6 CCfits-1.6-includecfitsiopath.patch, NONE, 1.1 CCfits.spec, 1.7, 1.8
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Thu Feb 1 11:13:39 UTC 2007
Author: sergiopr
Update of /cvs/extras/rpms/CCfits/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9383
Modified Files:
CCfits.spec
Added Files:
CCfits-1.6-includecfitsiopath.patch
Log Message:
* 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.
CCfits-1.6-includecfitsiopath.patch:
--- NEW FILE CCfits-1.6-includecfitsiopath.patch ---
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
@@ -13,7 +13,7 @@
// string
#include <string>
// fitsio
-#include "fitsio.h"
+#include <cfitsio/fitsio.h>
namespace CCfits {
class ExtHDU;
@@ -21,7 +21,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
@@ -13,7 +13,7 @@
// string
#include <string>
// fitsio
-#include "fitsio.h"
+#include <cfitsio/fitsio.h>
// map
#include <map>
// CCfitsHeader
Index: CCfits.spec
===================================================================
RCS file: /cvs/extras/rpms/CCfits/FC-6/CCfits.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CCfits.spec 11 Dec 2006 18:32:48 -0000 1.7
+++ CCfits.spec 1 Feb 2007 11:13:09 -0000 1.8
@@ -1,6 +1,6 @@
Name: CCfits
Version: 1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A C++ interface for cfitsio
Group: Development/Libraries
@@ -8,6 +8,7 @@
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)
BuildRequires: cfitsio-devel >= 3.020
@@ -39,6 +40,7 @@
%prep
%setup -q -n CCfits
%patch0 -p1
+%patch1 -p1
# Remove perl files in html docs
rm -rf %{_builddir}/%{name}/html/*.pl
@@ -75,6 +77,8 @@
%doc html
%changelog
+* 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
More information about the scm-commits
mailing list