diff options
author | Jakub Bogusz | 2021-11-27 07:24:20 (GMT) |
---|---|---|
committer | Jakub Bogusz | 2021-11-27 07:24:20 (GMT) |
commit | ab650c117e867729d8d1876ffdaf05b4d1f48c5b (patch) | |
tree | 0c92d62cedf7e19db9016113f066cf007a797ed5 | |
parent | 2daad9c3b17c935131a05281f3ba7f541e4b1705 (diff) | |
download | cfitsio-ab650c117e867729d8d1876ffdaf05b4d1f48c5b.zip cfitsio-ab650c117e867729d8d1876ffdaf05b4d1f48c5b.tar.gz |
- updated to 4.0.0auto/th/cfitsio-4.0.0-1
- removed obsolete zlib patch (only system zlib is supported now)
-rw-r--r-- | cfitsio-zlib.patch | 32 | ||||
-rw-r--r-- | cfitsio.spec | 15 |
2 files changed, 4 insertions, 43 deletions
diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch deleted file mode 100644 index 482cd24..0000000 --- a/cfitsio-zlib.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 @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 \ -- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c -+ZLIB_SOURCES = \ -+ zlib/zcompress.c zlib/zuncompress.c - - SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@ - -@@ -103,7 +102,7 @@ - shared: lib${PACKAGE}${SHLIB_SUFFIX} - - lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} -- ${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-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 8e83f89..8e198d6 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -2,15 +2,12 @@ Summary: CFITSIO Interface Library Summary(pl.UTF-8): Biblioteka interfejsu CFITSIO Name: cfitsio -# add "0" to to version to avoid epoch bumps after 3.450 -%define sver 3.49 -Version: %{sver}0 +Version: 4.0.0 Release: 1 License: MIT-like Group: Libraries -Source0: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%{name}-%{sver}.tar.gz -# Source0-md5: 171860ffed8c1a396fc497d853f285c1 -Patch0: %{name}-zlib.patch +Source0: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%{name}-%{version}.tar.gz +# Source0-md5: 7b2d4855208a1029f9ad21afdbbb690b Patch1: %{name}-ldflags.patch URL: https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html BuildRequires: autoconf @@ -56,13 +53,9 @@ Static version of CFITSIO library. Statyczna wersja biblioteki CFITSIO. %prep -%setup -q -n %{name}-%{sver} -%patch0 -p1 +%setup -q %patch1 -p1 -# enforce headers from system zlib -%{__rm} zlib/{crc32.h,deflate.h,inffast.h,inffixed.h,inflate.h,inftrees.h,zconf.h,zlib.h,zutil.h} - %build %{__autoconf} %configure \ |