From 87e513dd5f3f0c7c0d7cdd52a5bec66d2ef8a8ac Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mar 07 2006 17:40:23 +0000 Subject: auto-import CCfits-1.4-3.fc4 on branch devel from CCfits-1.4-3.fc4.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..99ebce6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +CCfits-1.4.tar.gz diff --git a/CCfits-1.4-g++4.patch b/CCfits-1.4-g++4.patch new file mode 100644 index 0000000..ab5f14a --- /dev/null +++ b/CCfits-1.4-g++4.patch @@ -0,0 +1,98 @@ +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-1.4-removerpath.patch b/CCfits-1.4-removerpath.patch new file mode 100644 index 0000000..0f78cb7 --- /dev/null +++ b/CCfits-1.4-removerpath.patch @@ -0,0 +1,43 @@ +--- CCfits.old/Makefile.in 2006-02-20 21:05:34.000000000 +0100 ++++ CCfits/Makefile.in 2006-02-20 21:08:28.000000000 +0100 +@@ -157,8 +157,6 @@ + + SUBDIRS = vs.net + +-R_LIB_PATH = @RDFLAGS@ +- + MSVC_FILES = MSconfig.h + + EXTRA_DIST = config BUILD CHANGES $(MSVC_FILES) +@@ -168,7 +166,6 @@ + cookbook_SOURCES = cookbook.cxx + + cookbook_LDADD = libCCfits.la +-cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH) + + INCLUDES = -I$(top_srcdir)/.. + +@@ -198,7 +195,6 @@ + # This will tell shared library which STD C++ library to use without + # needing the user to use LD_LIBRARY_PATH environment variable + libCCfits_la_LIBADD = $(LIBSTDCPP) +-libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH) + + libCCfits_ladir = $(pkgincludedir) + +@@ -241,6 +237,7 @@ + CONFIG_CLEAN_FILES = Doxyfile + LTLIBRARIES = $(lib_LTLIBRARIES) + ++libCCfits_la_LDFLAGS = + libCCfits_la_DEPENDENCIES = + am_libCCfits_la_OBJECTS = AsciiTable.lo BinTable.lo Column.lo \ + ColumnCreator.lo ColumnData.lo ColumnVectorData.lo ExtHDU.lo \ +@@ -254,6 +251,7 @@ + am_cookbook_OBJECTS = cookbook.$(OBJEXT) + cookbook_OBJECTS = $(am_cookbook_OBJECTS) + cookbook_DEPENDENCIES = libCCfits.la ++cookbook_LDFLAGS = + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I. + depcomp = $(SHELL) $(top_srcdir)/config/depcomp diff --git a/CCfits.spec b/CCfits.spec new file mode 100644 index 0000000..991e61a --- /dev/null +++ b/CCfits.spec @@ -0,0 +1,91 @@ +Name: CCfits +Version: 1.4 +Release: 3%{?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 +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: cfitsio-devel +BuildRequires: gcc-c++ +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description +CCfits is an object oriented interface to the cfitsio library. It is designed +to make the capabilities of cfitsio available to programmers working in C++. +It is written in ANSI C++ and implemented using the C++ Standard Library +with namespaces, exception handling, and member template functions. + +%package devel +Summary: Headers for developing programs that will use %{name} +Group: Development/Libraries +Requires: cfitsio-devel +Requires: %{name} = %{version}-%{release} +%description devel +These are the header files and libraries needed to develop a %{name} +application. + +%package docs +Summary: Documentation for %{name}, includes full API docs +Group: Documentation + +%description docs +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 +make %{?_smp_mflags} + +%install +rm -fr %{buildroot} +make install DESTDIR=%{buildroot} + +%clean +rm -fr %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc License.txt +%{_libdir}/*so.* + +%files devel +%defattr(-,root,root) +%doc CHANGES +%exclude %{_bindir}/cookbook +%{_libdir}/*.so +%exclude %{_libdir}/*.la +%{_includedir}/* + +%files docs +%defattr(-,root,root,-) +%doc html + +%changelog +* Tue Mar 07 2006 Sergio Pascual 1.4-3 +- Rebuilt with new upstream source. +* Mon Mar 06 2006 Sergio Pascual 1.4-2 +- Removed Source with license file License.txt. +* Mon Feb 20 2006 Sergio Pascual 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 1.4-0 +- Initial spec file. diff --git a/sources b/sources index e69de29..b1b2cf0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +230edb39de6a1e3dc6e0adda65d0676d CCfits-1.4.tar.gz