diff --git a/CCfits.spec b/CCfits.spec index a03c034..0d6ae7e 100644 --- a/CCfits.spec +++ b/CCfits.spec @@ -1,13 +1,13 @@ Name: CCfits Version: 2.5 -Release: 10%{?dist} +Release: 11%{?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-2.5-removerpath.patch +Patch1: cfitsio-path.patch BuildRequires: gcc-c++ cfitsio-devel @@ -19,7 +19,6 @@ 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 >= 3.280 Requires: %{name} = %{version}-%{release} %description devel @@ -28,7 +27,6 @@ application. %package doc Summary: Documentation for %{name}, includes full API docs -Group: Documentation BuildArch: noarch %description doc @@ -37,6 +35,7 @@ This package contains the full API documentation for %{name}. %prep %setup -q -n CCfits %patch0 -p1 +%patch1 -p1 rm -rf %{_builddir}/%{name}/html/*.pl %build @@ -46,9 +45,7 @@ make %{?_smp_mflags} %install make %{?_smp_mflags} install DESTDIR=%{buildroot} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license License.txt @@ -67,6 +64,9 @@ make %{?_smp_mflags} install DESTDIR=%{buildroot} %doc html %changelog +* Mon Feb 25 2019 Sergio Pascual 2.5-11 +- Patch headers with the correct cfistio path (bz #1676568) + * Thu Jul 12 2018 Fedora Release Engineering - 2.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/cfitsio-path.patch b/cfitsio-path.patch new file mode 100644 index 0000000..144aac0 --- /dev/null +++ b/cfitsio-path.patch @@ -0,0 +1,21 @@ +diff -ur CCfits/CCfits.h CCfits.path/CCfits.h +--- CCfits/CCfits.h 2016-01-11 19:37:49.000000000 +0100 ++++ CCfits.path/CCfits.h 2019-02-13 17:28:14.224009846 +0100 +@@ -10,7 +10,7 @@ + #define CCFITS_H 1 + + // fitsio +-#include "fitsio.h" ++#include + // string + #include + +@@ -21,7 +21,7 @@ + } // namespace CCfits + #include + #include +-#include "longnam.h" ++#include + #include "float.h" + +