From 5d16992a66c569ef05f33eb836bb81c7c4d9c175 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fedoraproject.org>
Date: Sun, 5 Dec 2021 11:08:56 +0100
Subject: [PATCH] New upstream version 4.0.0

---
 .gitignore              |  1 +
 cfitsio-pkgconfig.patch | 16 ++++------------
 cfitsio.spec            | 37 +++++++++++++++----------------------
 sources                 |  2 +-
 4 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39b84f9..fd363e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ cfitsio3250.tar.gz
 /cfitsio3450.tar.gz
 /cfitsio-3.47.tar.gz
 /cfitsio-3.49.tar.gz
+/cfitsio-4.0.0.tar.gz
diff --git a/cfitsio-pkgconfig.patch b/cfitsio-pkgconfig.patch
index b29e305..5d51b96 100644
--- a/cfitsio-pkgconfig.patch
+++ b/cfitsio-pkgconfig.patch
@@ -1,7 +1,7 @@
-diff -ur cfitsio-3.47/cfitsio.pc.in cfitsio-3.47.pkg/cfitsio.pc.in
---- cfitsio-3.47/cfitsio.pc.in	2019-05-08 17:34:49.000000000 +0200
-+++ cfitsio-3.47.pkg/cfitsio.pc.in	2019-08-01 15:56:52.064310329 +0200
-@@ -1,12 +1,12 @@
+diff -ur cfitsio-4.0.0/cfitsio.pc.in cfitsio-4.0.0.pc/cfitsio.pc.in
+--- cfitsio-4.0.0/cfitsio.pc.in	2021-05-20 03:18:54.000000000 +0200
++++ cfitsio-4.0.0.pc/cfitsio.pc.in	2021-12-03 17:38:32.302407819 +0100
+@@ -1,7 +1,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
@@ -10,11 +10,3 @@ diff -ur cfitsio-3.47/cfitsio.pc.in cfitsio-3.47.pkg/cfitsio.pc.in
  
  Name: cfitsio
  Description: FITS File Subroutine Library
- URL: https://heasarc.gsfc.nasa.gov/fitsio/
- Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
--Libs: -L${libdir} -lcfitsio
--Libs.private: -lm @LIBS@
--Cflags: -I${includedir}
-+Libs: -L${libdir} -lcfitsio
-+Libs.private: -lm -lz @LIBS@
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/cfitsio.spec b/cfitsio.spec
index 1920fab..5376c24 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,13 +1,11 @@
 Name: cfitsio
-Version: 3.490
-Release: 4%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
 Summary: Library for manipulating FITS data files
 
 License: MIT
 URL: http://heasarc.gsfc.nasa.gov/fitsio/
-Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz
-# Unbundles zlib
-Patch0: cfitsio-zlib.patch
+Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-%{version}.tar.gz
 # Remove soname version check
 Patch1: cfitsio-noversioncheck.patch
 # Some rearrangements in pkg-config file
@@ -17,9 +15,12 @@ Patch3: cfitsio-ldflags.patch
 # Remove rpath
 Patch4: cfitsio-remove-rpath.patch
 
-BuildRequires:     gcc-gfortran zlib-devel
-BuildRequires:     bzip2-devel
+BuildRequires: gcc-gfortran
 BuildRequires: make
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: curl-devel
+##BuildRequires: pkgconfig(curl)
 
 %description
 CFITSIO is a library of C and FORTRAN subroutines for reading and writing 
@@ -73,28 +74,17 @@ compression algorithm.
       (relative to those in the original image) depends on the selected
        amount of compression
 
-
 %prep
-%setup -q -n cfitsio-3.49
-%patch0 -p1
+%setup -q 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
-# remove bundled zlib
-# not all the files inside zlib belong to zlib
-pushd zlib
- rm adler32.c crc32.c deflate.c infback.c inffast.c inflate.c inflate.h \
- inftrees.c inftrees.h zlib.h deflate.h trees.c trees.h uncompr.c zconf.h \
- zutil.c zutil.h crc32.h  inffast.h  inffixed.h 
-popd
-
 %build
-%configure --enable-reentrant --with-bzip2
-make shared %{?_smp_mflags} 
-make fpack %{?_smp_mflags}
-make funpack %{?_smp_mflags}
+%configure --enable-reentrant -with-bzip2
+make shared
+make fpack funpack
 
 %check
 make testprog
@@ -141,6 +131,9 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 %{_bindir}/funpack
 
 %changelog
+* Fri Dec 03 2021 Sergio Pascual <sergiopr@fedoraproject.org> - 4.0.0-1
+- New upstream version 4.0.0
+
 * Sun Aug 01 2021 Sergio Pascual <sergiopr@fedoraproject.org> - 3.490-4
 - Remove rpath in utilities
 
diff --git a/sources b/sources
index a2f48a2..110a513 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cfitsio-3.49.tar.gz) = 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
+SHA512 (cfitsio-4.0.0.tar.gz) = a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa