From 1221b8569fcb94db939ace0367a3aeae5fd462b7 Mon Sep 17 00:00:00 2001 From: AkarshHCL Date: Thu, 28 Nov 2024 06:14:26 +0000 Subject: [PATCH] Upgrade: Cfitsio to version 4.5.0 --- SPECS-EXTENDED/cfitsio/cfitsio-ldflags.patch | 14 -- .../cfitsio/cfitsio-pkgconfig.patch | 12 -- .../cfitsio/cfitsio-remove-rpath.patch | 12 -- .../cfitsio/cfitsio.signatures.json | 2 +- SPECS-EXTENDED/cfitsio/cfitsio.spec | 163 ++++++++---------- cgmanifest.json | 4 +- 6 files changed, 77 insertions(+), 130 deletions(-) delete mode 100644 SPECS-EXTENDED/cfitsio/cfitsio-ldflags.patch delete mode 100644 SPECS-EXTENDED/cfitsio/cfitsio-pkgconfig.patch delete mode 100644 SPECS-EXTENDED/cfitsio/cfitsio-remove-rpath.patch diff --git a/SPECS-EXTENDED/cfitsio/cfitsio-ldflags.patch b/SPECS-EXTENDED/cfitsio/cfitsio-ldflags.patch deleted file mode 100644 index 4495d4626d0..00000000000 --- a/SPECS-EXTENDED/cfitsio/cfitsio-ldflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur cfitsio/configure cfitsio.ldflags/configure ---- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200 -+++ cfitsio.ldflags/configure 2018-05-23 17:17:18.452431657 +0200 -@@ -4215,8 +4215,8 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --LDFLAGS="$CFLAGS" --LDFLAGS_BIN="$LDFLAGS" -+# LDFLAGS="$CFLAGS" -+LDFLAGS_BIN="$CFLAGS" - - if test "x$FC" = "xnone" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5 diff --git a/SPECS-EXTENDED/cfitsio/cfitsio-pkgconfig.patch b/SPECS-EXTENDED/cfitsio/cfitsio-pkgconfig.patch deleted file mode 100644 index 5d51b969575..00000000000 --- a/SPECS-EXTENDED/cfitsio/cfitsio-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -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@ --includedir=@includedir@ -+includedir=@includedir@/cfitsio - - Name: cfitsio - Description: FITS File Subroutine Library diff --git a/SPECS-EXTENDED/cfitsio/cfitsio-remove-rpath.patch b/SPECS-EXTENDED/cfitsio/cfitsio-remove-rpath.patch deleted file mode 100644 index a8cee6b35d4..00000000000 --- a/SPECS-EXTENDED/cfitsio/cfitsio-remove-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur cfitsio-3.49/configure cfitsio-3.49.rpath/configure ---- cfitsio-3.49/configure 2021-08-01 10:11:12.159237384 +0200 -+++ cfitsio-3.49.rpath/configure 2021-08-01 10:24:32.504218725 +0200 -@@ -4673,7 +4673,7 @@ - $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h - - # LDFLAGS used by utilities: -- LDFLAGS_BIN="$LDFLAGS_BIN -Wl,-rpath,\${CFITSIO_LIB}" -+ LDFLAGS_BIN="$LDFLAGS_BIN" - ;; - *mingw32*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for large file support" >&5 diff --git a/SPECS-EXTENDED/cfitsio/cfitsio.signatures.json b/SPECS-EXTENDED/cfitsio/cfitsio.signatures.json index 46cd733a57e..3b1d3e1c3d2 100644 --- a/SPECS-EXTENDED/cfitsio/cfitsio.signatures.json +++ b/SPECS-EXTENDED/cfitsio/cfitsio.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "cfitsio-4.0.0.tar.gz": "b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e" + "cfitsio-4.5.0.tar.gz": "e4854fc3365c1462e493aa586bfaa2f3d0bb8c20b75a524955db64c27427ce09" } } diff --git a/SPECS-EXTENDED/cfitsio/cfitsio.spec b/SPECS-EXTENDED/cfitsio/cfitsio.spec index 613686f976a..0adf3893696 100644 --- a/SPECS-EXTENDED/cfitsio/cfitsio.spec +++ b/SPECS-EXTENDED/cfitsio/cfitsio.spec @@ -1,131 +1,116 @@ Summary: Library for manipulating FITS data files Name: cfitsio -Version: 4.0.0 -Release: 5%{?dist} -License: MIT +Version: 4.5.0 +Release: 1%{?dist} +License: CFITSIO Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://heasarc.gsfc.nasa.gov/fitsio/ Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%{name}-%{version}.tar.gz -# Remove soname version check -Patch1: cfitsio-noversioncheck.patch -# Some rearrangements in pkg-config file -Patch2: cfitsio-pkgconfig.patch -# Use builder linker flags -Patch3: cfitsio-ldflags.patch -# Remove rpath -Patch4: cfitsio-remove-rpath.patch -BuildRequires: bzip2-devel -BuildRequires: curl-devel -BuildRequires: gcc-gfortran -BuildRequires: make -BuildRequires: zlib-devel -##BuildRequires: pkgconfig(curl) - +Patch: cfitsio-noversioncheck.patch + +BuildRequires: gcc-gfortran +BuildRequires: make +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: curl-devel + %description -CFITSIO is a library of C and FORTRAN subroutines for reading and writing -data files in FITS (Flexible Image Transport System) data format. CFITSIO -simplifies the task of writing software that deals with FITS files by -providing an easy to use set of high-level routines that insulate the -programmer from the internal complexities of the FITS file format. At the -same time, CFITSIO provides many advanced features that have made it the -most widely used FITS file programming interface in the astronomical +CFITSIO is a library of C and FORTRAN subroutines for reading and writing +data files in FITS (Flexible Image Transport System) data format. CFITSIO +simplifies the task of writing software that deals with FITS files by +providing an easy to use set of high-level routines that insulate the +programmer from the internal complexities of the FITS file format. At the +same time, CFITSIO provides many advanced features that have made it the +most widely used FITS file programming interface in the astronomical community. - + %package devel -Summary: Headers required when building programs against cfitsio -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig - +Summary: Headers required when building programs against cfitsio +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + %description devel Headers required when building a program against the cfitsio library. - + %package static -Summary: Static cfitsio library - +Summary: Static cfitsio library + %description static Static cfitsio library; avoid use if possible. - + %package docs -Summary: Documentation for cfitsio -BuildArch: noarch - +Summary: Documentation for cfitsio +BuildArch: noarch + %description docs Stand-alone documentation for cfitsio. - -%package -n fpack -Summary: FITS image compression and decompression utilities -Requires: %{name} = %{version}-%{release} - -%description -n fpack -fpack optimally compresses FITS format images and funpack restores them -to the original state. - -* Integer format images are losslessly compressed using the Rice -compression algorithm. - * typically 30% better compression than GZIP - * about 3 times faster compression speed than GZIP - * about the same uncompression speed as GUNZIP - -* Floating-point format images are compressed with a lossy algorithm - * truncates the image pixel noise by a user-specified amount to - produce much higher compression than by lossless techniques - * the precision of scientific measurements in the compressed image - (relative to those in the original image) depends on the selected - amount of compression - + +%package utils +Summary: CFITSIO based utilities +Requires: %{name} = %{version}-%{release} +Provides: fpack{?_isa} = %{version}-%{release} +Obsoletes: fpack <= 4.5.0-1 +Provides: fitsverify{?_isa} = 4.22-5 +Obsoletes: fitsverify <= 4.22-4 + +%description utils +This package contains utility programas provided by CFITSIO + %prep -%autosetup - +%autosetup -p1 + %build -%configure --enable-reentrant -with-bzip2 -make shared -make fpack funpack - +%configure --enable-reentrant -with-bzip2 --includedir=%{_includedir}/%{name} +make %{?_smp_mflags} + %check make testprog LD_LIBRARY_PATH=. ./testprog > testprog.lis cmp -s testprog.lis testprog.out cmp -s testprog.fit testprog.std - + %install -%make_install LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \ - CFITSIO_LIB=%{buildroot}%{_libdir} \ - CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} -cp -p f{,un}pack %{buildroot}%{_bindir} - -chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.* -chmod 755 %{buildroot}%{_bindir}/f{,un}pack - - +make DESTDIR=%{buildroot} install +# +rm %{buildroot}/%{_bindir}/cookbook +rm %{buildroot}/%{_bindir}/smem +rm %{buildroot}/%{_bindir}/speed + %ldconfig_scriptlets - %files -%license License.txt -%doc README docs/changes.txt -%{_libdir}/libcfitsio.so.9* - +%doc README.md ChangeLog +%license licenses/License.txt +%{_libdir}/libcfitsio.so.10* + %{_libdir}/libcfitsio.la + %files devel -%doc cookbook.* +%doc utilities/cookbook.* %{_includedir}/%{name} %{_libdir}/libcfitsio.so %{_libdir}/pkgconfig/cfitsio.pc - + %files static -%license License.txt +%license licenses/License.txt %{_libdir}/libcfitsio.a - + %files docs -%license License.txt -%doc docs/fitsio.doc docs/fitsio.pdf docs/cfitsio.pdf - -%files -n fpack -%license License.txt +%doc docs/fitsio.pdf docs/cfitsio.pdf +%license licenses/License.txt + +%files utils %doc docs/fpackguide.pdf +%license licenses/License.txt +%{_bindir}/fitsverify +%{_bindir}/fitscopy %{_bindir}/fpack %{_bindir}/funpack +%{_bindir}/imcopy %changelog +* Thu Nov 28 2024 Akarsh Chaudhary - 4.5.0-1 +- Upgrade to version 4.5.0 + * Wed Aug 09 2023 Archana Choudhary - 4.0.0-5 - Initial CBL-Mariner import from Fedora 37 (license: MIT). - License verified diff --git a/cgmanifest.json b/cgmanifest.json index 59ac79df69a..502e7f16bc6 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1587,8 +1587,8 @@ "type": "other", "other": { "name": "cfitsio", - "version": "4.0.0", - "downloadUrl": "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.0.0.tar.gz" + "version": "4.5.0", + "downloadUrl": "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.5.0.tar.gz" } } },