From b2db04fc43b33ab9260303b0cc37dcb81ea3c672 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Jan 06 2012 09:04:32 +0000 Subject: New upstream source 2.4 Removing obsoletes for doc package Rebuilt to match new cfitsio 3.290 --- diff --git a/.gitignore b/.gitignore index e039c28..7eb6a0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ CCfits-2.2.tar.gz /CCfits-2.3.tar.gz +/CCfits-2.4.tar.gz diff --git a/CCfits-pkgconfig.patch b/CCfits-pkgconfig.patch deleted file mode 100644 index 56b3892..0000000 --- a/CCfits-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur CCfits/CCfits.pc.in CCfits.pkg/CCfits.pc.in ---- CCfits/CCfits.pc.in 2009-09-02 16:34:32.000000000 +0200 -+++ CCfits.pkg/CCfits.pc.in 2009-09-10 16:24:41.000000000 +0200 -@@ -5,8 +5,8 @@ - - Name: CCfits - Description: Object Oriented C++ Interface to CFITSIO Library --Requires: cfitsio -+Requires.private: cfitsio > 3.08 - Version: 2.2 --Libs: -L${libdir} -lCCfits @LIBS@ -+Libs: -L${libdir} -lCCfits - Cflags: -I${includedir} - diff --git a/CCfits.spec b/CCfits.spec index 53ebb0c..3908fc2 100644 --- a/CCfits.spec +++ b/CCfits.spec @@ -1,6 +1,6 @@ Name: CCfits -Version: 2.3 -Release: 4%{?dist} +Version: 2.4 +Release: 1%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries @@ -8,9 +8,8 @@ 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.6-removerpath.patch -Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: cfitsio-devel +BuildRequires: cfitsio-devel = 3.290 %description CCfits is an object oriented interface to the cfitsio library. It is designed @@ -31,8 +30,6 @@ application. Summary: Documentation for %{name}, includes full API docs Group: Documentation BuildArch: noarch -Obsoletes: CCfits-docs < 2.2-2 -Provides: CCfits-docs = %{version}-%{release} %description doc This package contains the full API documentation for %{name}. @@ -50,20 +47,15 @@ make %{?_smp_mflags} rm -rf %{buildroot} make %{?_smp_mflags} install DESTDIR=%{buildroot} -%clean -rm -rf %{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 @@ -72,10 +64,14 @@ rm -rf %{buildroot} %{_includedir}/* %files doc -%defattr(-,root,root,-) %doc License.txt html %changelog +* Fri Jan 06 2012 Sergio Pascual 2.4-1 +- New upstream source 2.4 +- Removing obsoletes for doc package +- Rebuilt to match new cfitsio 3.290 + * Fri Jun 10 2011 Sergio Pascual 2.3-4 - Rebuilt to match new cfitsio 3.280 diff --git a/sources b/sources index fee7091..eaf74d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46bcd289012e6f6189f2a5fd6710f40f CCfits-2.3.tar.gz +dd9a11d964590dd5f3fd5a3491b2c1ce CCfits-2.4.tar.gz