diff --git a/CCfits-1.4-g++4.patch b/CCfits-1.4-g++4.patch deleted file mode 100644 index ab5f14a..0000000 --- a/CCfits-1.4-g++4.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -ur CCfits.old/ExtHDUT.h CCfits/ExtHDUT.h ---- CCfits.old/ExtHDUT.h 2006-02-16 11:36:03.000000000 +0100 -+++ CCfits/ExtHDUT.h 2006-02-16 11:35:31.000000000 +0100 -@@ -145,7 +145,8 @@ - long firstElement(0); - long dimSize(1); - std::vector inputDimensions(naxis(),1); -- size_t n(std::min(naxis(),first.size())); -+ size_t sNaxis = static_cast(naxis()); -+ size_t n(std::min(sNaxis,first.size())); - std::copy(&first[0],&first[n],&inputDimensions[0]); - for (long i = 0; i < naxis(); ++i) - { -diff -ur CCfits.old/PHDUT.h CCfits/PHDUT.h ---- CCfits.old/PHDUT.h 2006-02-16 11:36:03.000000000 +0100 -+++ CCfits/PHDUT.h 2006-02-16 11:35:31.000000000 +0100 -@@ -141,7 +141,8 @@ - long firstElement(0); - long dimSize(1); - std::vector inputDimensions(naxis(),1); -- size_t n(std::min(naxis(),first.size())); -+ size_t sNaxis = static_cast(naxis()); -+ size_t n(std::min(sNaxis,first.size())); - std::copy(&first[0],&first[n],&inputDimensions[0]); - for (long i = 0; i < naxis(); ++i) - { -@@ -553,7 +554,7 @@ - try - { - PrimaryHDU& image = dynamic_cast&>(*this); -- image.writeImage(firstVertex,lastVertex,stride,data); -+ image.writeImage(firstVertex,lastVertex,data); - } - catch (std::bad_cast) - { -@@ -565,7 +566,7 @@ - size_t n(data.size()); - std::valarray __tmp(n); - for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; -- phdu.writeImage(firstVertex,lastVertex,stride,__tmp); -+ phdu.writeImage(firstVertex,lastVertex,__tmp); - - } - else if (bitpix() == Idouble) -@@ -575,7 +576,7 @@ - size_t n(data.size()); - std::valarray __tmp(n); - for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; -- phdu.writeImage(firstVertex,lastVertex,stride,__tmp); -+ phdu.writeImage(firstVertex,lastVertex,__tmp); - } - else if (bitpix() == Ibyte) - { -@@ -584,7 +585,7 @@ - size_t n(data.size()); - std::valarray __tmp(n); - for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; -- phdu.writeImage(firstVertex,lastVertex,stride,__tmp); -+ phdu.writeImage(firstVertex,lastVertex,__tmp); - } - else if (bitpix() == Ilong) - { -@@ -595,7 +596,7 @@ - size_t n(data.size()); - std::valarray __tmp(n); - for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; -- phdu.writeImage(firstVertex,lastVertex,stride,__tmp); -+ phdu.writeImage(firstVertex,lastVertex,__tmp); - - } - else -@@ -605,7 +606,7 @@ - size_t n(data.size()); - std::valarray __tmp(n); - for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; -- phdu.writeImage(firstVertex,lastVertex,stride,__tmp); -+ phdu.writeImage(firstVertex,lastVertex,__tmp); - } - } - else if (bitpix() == Ishort) -@@ -617,7 +618,7 @@ - size_t n(data.size()); - std::valarray __tmp(n); - for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; -- phdu.writeImage(firstVertex,lastVertex,stride,__tmp); -+ phdu.writeImage(firstVertex,lastVertex,__tmp); - - } - else -@@ -627,7 +628,7 @@ - size_t n(data.size()); - std::valarray __tmp(n); - for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; -- phdu.writeImage(firstVertex,lastVertex,stride,__tmp); -+ phdu.writeImage(firstVertex,lastVertex,__tmp); - } - } - else diff --git a/CCfits.spec b/CCfits.spec index 9b0c7d2..ae265e7 100644 --- a/CCfits.spec +++ b/CCfits.spec @@ -1,14 +1,13 @@ Name: CCfits -Version: 1.4 -Release: 4%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries License: BSD URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits -Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/CCfits-1.4.tar.gz -Patch0: CCfits-1.4-g++4.patch -Patch1: CCfits-1.4-removerpath.patch +Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz +Patch0: CCfits-1.4-removerpath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel @@ -40,9 +39,6 @@ This package contains the full API documentation for %{name}. %prep %setup -q -n CCfits %patch0 -p1 -%patch1 -p1 -# Remove perl files in html docs -rm -rf %{_builddir}/%{name}/html/*.pl %build %configure --disable-static --with-cfitsio=%{_prefix} --with-cfitsio-include=%{_includedir}/cfitsio @@ -77,6 +73,10 @@ rm -fr %{buildroot} %doc html %changelog +* Thu Jul 27 2006 Sergio Pascual 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 1.4-4 - Removed explicit Buildrequires gcc-c++ * Tue Mar 07 2006 Sergio Pascual 1.4-3