New upstream version 4.0.0

epel9
Sergio Pascual 3 years ago
parent 3026cf547b
commit 5d16992a66

1
.gitignore vendored

@ -14,3 +14,4 @@ cfitsio3250.tar.gz
/cfitsio3450.tar.gz /cfitsio3450.tar.gz
/cfitsio-3.47.tar.gz /cfitsio-3.47.tar.gz
/cfitsio-3.49.tar.gz /cfitsio-3.49.tar.gz
/cfitsio-4.0.0.tar.gz

@ -1,7 +1,7 @@
diff -ur cfitsio-3.47/cfitsio.pc.in cfitsio-3.47.pkg/cfitsio.pc.in diff -ur cfitsio-4.0.0/cfitsio.pc.in cfitsio-4.0.0.pc/cfitsio.pc.in
--- cfitsio-3.47/cfitsio.pc.in 2019-05-08 17:34:49.000000000 +0200 --- cfitsio-4.0.0/cfitsio.pc.in 2021-05-20 03:18:54.000000000 +0200
+++ cfitsio-3.47.pkg/cfitsio.pc.in 2019-08-01 15:56:52.064310329 +0200 +++ cfitsio-4.0.0.pc/cfitsio.pc.in 2021-12-03 17:38:32.302407819 +0100
@@ -1,12 +1,12 @@ @@ -1,7 +1,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
@ -10,11 +10,3 @@ diff -ur cfitsio-3.47/cfitsio.pc.in cfitsio-3.47.pkg/cfitsio.pc.in
Name: cfitsio Name: cfitsio
Description: FITS File Subroutine Library 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}

@ -1,13 +1,11 @@
Name: cfitsio Name: cfitsio
Version: 3.490 Version: 4.0.0
Release: 4%{?dist} Release: 1%{?dist}
Summary: Library for manipulating FITS data files Summary: Library for manipulating FITS data files
License: MIT License: MIT
URL: http://heasarc.gsfc.nasa.gov/fitsio/ URL: http://heasarc.gsfc.nasa.gov/fitsio/
Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-%{version}.tar.gz
# Unbundles zlib
Patch0: cfitsio-zlib.patch
# Remove soname version check # Remove soname version check
Patch1: cfitsio-noversioncheck.patch Patch1: cfitsio-noversioncheck.patch
# Some rearrangements in pkg-config file # Some rearrangements in pkg-config file
@ -17,9 +15,12 @@ Patch3: cfitsio-ldflags.patch
# Remove rpath # Remove rpath
Patch4: cfitsio-remove-rpath.patch Patch4: cfitsio-remove-rpath.patch
BuildRequires: gcc-gfortran zlib-devel BuildRequires: gcc-gfortran
BuildRequires: bzip2-devel
BuildRequires: make BuildRequires: make
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: curl-devel
##BuildRequires: pkgconfig(curl)
%description %description
CFITSIO is a library of C and FORTRAN subroutines for reading and writing 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 (relative to those in the original image) depends on the selected
amount of compression amount of compression
%prep %prep
%setup -q -n cfitsio-3.49 %setup -q
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -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 %build
%configure --enable-reentrant --with-bzip2 %configure --enable-reentrant -with-bzip2
make shared %{?_smp_mflags} make shared
make fpack %{?_smp_mflags} make fpack funpack
make funpack %{?_smp_mflags}
%check %check
make testprog make testprog
@ -141,6 +131,9 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
%{_bindir}/funpack %{_bindir}/funpack
%changelog %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 * Sun Aug 01 2021 Sergio Pascual <sergiopr@fedoraproject.org> - 3.490-4
- Remove rpath in utilities - Remove rpath in utilities

@ -1 +1 @@
SHA512 (cfitsio-3.49.tar.gz) = 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 SHA512 (cfitsio-4.0.0.tar.gz) = a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa

Loading…
Cancel
Save