- updated to 3.49 (as 3.490 to avoid epoch bump; note: new soname)

diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch
index 33d2f5f10f282aae0c1d25100ddcb83498550dbe..482cd24fd32f986ce99cc95e245dc6094bcc3ed8 100644 (file)
--- a/cfitsio-zlib.patch
+++ b/cfitsio-zlib.patch
@@ -1,8 +1,8 @@
---- cfitsio/Makefile.in.orig   2016-01-08 18:27:12.000000000 +0100
-+++ cfitsio/Makefile.in        2016-03-17 16:48:57.669945464 +0100
-@@ -66,9 +66,8 @@
+--- cfitsio-3.49/Makefile.in.orig      2020-08-12 20:01:04.000000000 +0200
++++ cfitsio-3.49/Makefile.in   2020-11-09 21:44:47.421950691 +0100
+@@ -68,9 +68,8 @@
                pliocomp.c fits_hcompress.c fits_hdecompress.c \
-               simplerng.c
+               simplerng.c @GSIFTP_SRC@
  
 -ZLIB_SOURCES =        zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
 -              zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
@@ -12,21 +12,21 @@
  
  SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
  
-@@ -101,7 +100,7 @@
+@@ -103,7 +102,7 @@
  shared: lib${PACKAGE}${SHLIB_SUFFIX}
  
  lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
--              ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
-+              ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz ${LIBS}
+-              ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
++              ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz ${LIBS_CURL} ${LIBS}
                @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
                        ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
                        ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
---- cfitsio/cfitsio.pc.in.orig 2011-05-12 20:35:39.000000000 +0200
-+++ cfitsio/cfitsio.pc.in      2011-08-22 08:26:36.306040160 +0200
-@@ -7,5 +7,5 @@ Name: cfitsio
- Description: FITS File Subroutine Library
- Version: 3.28
- Libs: -L${libdir} -lcfitsio @LIBS@
--Libs.private: -lm
-+Libs.private: -lm -lz
+--- cfitsio-3.49/cfitsio.pc.in.orig    2020-11-09 20:39:59.376347376 +0100
++++ cfitsio-3.49/cfitsio.pc.in 2020-11-09 21:45:17.881785676 +0100
+@@ -8,5 +8,5 @@
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
+ Libs: -L${libdir} -lcfitsio
+-Libs.private: -lm @LIBS@
++Libs.private: -lm -lz @LIBS@
  Cflags: -I${includedir}

diff --git a/cfitsio.spec b/cfitsio.spec
index a6a6d019de78563f16c268d5a447f79d1791daa0..8e83f89f34ac199bdeb2b667ab06de3edcd187a1 100644 (file)
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -2,13 +2,14 @@
 Summary:       CFITSIO Interface Library
 Summary(pl.UTF-8):     Biblioteka interfejsu CFITSIO
 Name:          cfitsio
-Version:       3.450
-%define        sver    %(echo %{version} | tr -d .)
+# add "0" to to version to avoid epoch bumps after 3.450
+%define        sver    3.49
+Version:       %{sver}0
 Release:       1
 License:       MIT-like
 Group:         Libraries
-Source0:       https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%{name}%{sver}.tar.gz
-# Source0-md5: f470849bb43561d9a9b1925eeb7f7f0d
+Source0:       https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%{name}-%{sver}.tar.gz
+# Source0-md5: 171860ffed8c1a396fc497d853f285c1
 Patch0:                %{name}-zlib.patch
 Patch1:                %{name}-ldflags.patch
 URL:           https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
@@ -55,7 +56,7 @@ Static version of CFITSIO library.
 Statyczna wersja biblioteki CFITSIO.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{sver}
 %patch0 -p1
 %patch1 -p1
 
@@ -87,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc License.txt README docs/changes.txt
 %attr(755,root,root) %{_libdir}/libcfitsio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcfitsio.so.7
+%attr(755,root,root) %ghost %{_libdir}/libcfitsio.so.9
 
 %files devel
 %defattr(644,root,root,755)