diff --git a/cfitsio-fix-hcompress-overflow.patch b/cfitsio-fix-hcompress-overflow.patch new file mode 100644 index 0000000..64a5479 --- /dev/null +++ b/cfitsio-fix-hcompress-overflow.patch @@ -0,0 +1,12 @@ +diff -Naur cfitsio/imcompress.c cfitsio.new/imcompress.c +--- cfitsio/imcompress.c 2013-11-22 21:37:42.000000000 +0100 ++++ cfitsio.new/imcompress.c 2017-10-02 14:59:15.109929047 +0200 +@@ -6315,7 +6315,7 @@ + */ + + if ((infptr->Fptr)->compress_type == HCOMPRESS_1) { +- if (*status == NUM_OVERFLOW) *status = 0; ++ if ((*status == NUM_OVERFLOW) || (*status == OVERFLOW_ERR)) *status = 0; + } + } + else if (tiledatatype == TSHORT) diff --git a/cfitsio.spec b/cfitsio.spec index 501b0dd..ebc2c30 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.370 -Release: 1%{?dist} +Release: 10%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries License: MIT @@ -12,6 +12,8 @@ Patch0: cfitsio-zlib.patch Patch1: cfitsio-noversioncheck.patch # Some rearrangements in pkg-config file Patch2: cfitsio-pkgconfig.patch +# Backported fix for hcompress +Patch3: cfitsio-fix-hcompress-overflow.patch BuildRequires: gcc-gfortran zlib-devel BuildRequires: bzip2-devel @@ -32,7 +34,7 @@ community. Group: Development/Libraries Summary: Headers required when building programs against cfitsio Requires: %{name} = %{version}-%{release} -Requires: pkgconfig glibc-headers +Requires: pkgconfig %description devel Headers required when building a program against the cfitsio library. @@ -80,6 +82,7 @@ compression algorithm. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # remove bundled zlib # not all the files inside zlib belong to zlib @@ -124,6 +127,7 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack %{_libdir}/libcfitsio.so.* %files devel +%doc cookbook.* %{_includedir}/%{name} %{_libdir}/libcfitsio.so %{_libdir}/pkgconfig/cfitsio.pc @@ -141,6 +145,33 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack %{_bindir}/funpack %changelog +* Mon Oct 02 2017 Christian Dersch - 3.370-10 +- Fix hcompress + +* Wed Aug 02 2017 Fedora Release Engineering - 3.370-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.370-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.370-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 3.370-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 3.370-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jun 11 2015 Sergio Pascual - 3.370-4 +- Remove glibc-headers from devel requires (fixes bz #1230471) + +* Thu Sep 18 2014 Orion Poplawski - 3.370-3 +- Ship cookbook example in -devel docs + +* Fri Aug 15 2014 Fedora Release Engineering - 3.370-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Thu Jun 12 2014 Sergio Pascual - 3.370-1 - New upstream (3.370) - Patches for ppc64le and aarch64 added upstream