From edcd53512409bf025f2a5c2f58f50af8f1182b45 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Dec 11 2006 18:32:48 +0000 Subject: - New upstream version 1.6. Only compiles with cfitsio >= 3.020. Tue Sep 12 2006 Sergio Pascual 1.5-3 - Rebuild for FC6. Fri Jul 28 2006 Sergio Pascual 1.5-2 - Removed perl files in the documentation (bug #200517). 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 - 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/.cvsignore b/.cvsignore index 1d464bc..0b9f50c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -CCfits-1.5.tar.gz +CCfits-1.6.tar.gz diff --git a/CCfits-1.4-removerpath.patch b/CCfits-1.4-removerpath.patch deleted file mode 100644 index 0f78cb7..0000000 --- a/CCfits-1.4-removerpath.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- 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-1.6-removerpath.patch b/CCfits-1.6-removerpath.patch new file mode 100644 index 0000000..2ad1510 --- /dev/null +++ b/CCfits-1.6-removerpath.patch @@ -0,0 +1,27 @@ +diff -ur CCfits.old/Makefile.in CCfits/Makefile.in +--- CCfits.old/Makefile.in 2006-12-11 18:33:17.000000000 +0100 ++++ CCfits/Makefile.in 2006-12-11 18:32:32.000000000 +0100 +@@ -241,12 +241,12 @@ + # generation like gcc does + AUTOMAKE_OPTIONS = foreign # no-dependencies + SUBDIRS = vs.net +-R_LIB_PATH = @RDFLAGS@ ++R_LIB_PATH = + MSVC_FILES = MSconfig.h + EXTRA_DIST = config CHANGES README.INSTALL License.txt file1.pha $(MSVC_FILES) + cookbook_SOURCES = cookbook.cxx + cookbook_LDADD = libCCfits.la +-cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH) ++cookbook_LDFLAGS = + INCLUDES = -I$(top_srcdir)/.. + lib_LTLIBRARIES = libCCfits.la + libCCfits_la_SOURCES = \ +@@ -273,7 +273,7 @@ + # 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_la_LDFLAGS = + libCCfits_ladir = $(pkgincludedir) + libCCfits_la_HEADERS = \ + AsciiTable.h \ diff --git a/CCfits.spec b/CCfits.spec index 07519cc..c78ad52 100644 --- a/CCfits.spec +++ b/CCfits.spec @@ -1,16 +1,16 @@ Name: CCfits -Version: 1.5 -Release: 3%{?dist} +Version: 1.6 +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/%{name}-%{version}.tar.gz -Patch0: CCfits-1.4-removerpath.patch +Patch0: CCfits-1.6-removerpath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cfitsio-devel +BuildRequires: cfitsio-devel >= 3.020 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -75,6 +75,8 @@ rm -fr %{buildroot} %doc html %changelog +* Mon Dec 11 2006 Sergio Pascual 1.6-1 +- New upstream version 1.6. Only compiles with cfitsio >= 3.020. * Tue Sep 12 2006 Sergio Pascual 1.5-3 - Rebuild for FC6. * Fri Jul 28 2006 Sergio Pascual 1.5-2 diff --git a/sources b/sources index 7394512..518ee3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41a8b37dc05bd3ddfcb0db4fc9c5bdd1 CCfits-1.5.tar.gz +3a5a4369e21a65d819edf82cea5428f6 CCfits-1.6.tar.gz