Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| add4d1590a | |||
| a4871a1f0a | |||
| 59fc31e38b | |||
| d2e5827f8e |
@@ -1,4 +1,5 @@
|
||||
<multibuild>
|
||||
<package>openmpi4</package>
|
||||
<package>openmpi5</package>
|
||||
</multibuild>
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:480d3340fa17e9ba67f18efbaff4bbb272a01d1f400d2295c0b6c86eb7abcf82
|
||||
size 16973911
|
||||
3
casacore-3.7.1.tar.gz
Normal file
3
casacore-3.7.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad7ad865d5d8517524bdde71e0083a69442648b693850660dadb0ce6109d91c7
|
||||
size 16986653
|
||||
@@ -1,15 +0,0 @@
|
||||
Index: casacore-3.3.0/fits/FITS/blockio.h
|
||||
===================================================================
|
||||
--- casacore-3.3.0.orig/fits/FITS/blockio.h
|
||||
+++ casacore-3.3.0/fits/FITS/blockio.h
|
||||
@@ -32,8 +32,8 @@
|
||||
|
||||
//# Make sure that cfitsio does not declare the wcs headers.
|
||||
extern "C"{
|
||||
-#include <fitsio.h> //# header file from cfitsio
|
||||
-#include <fitsio2.h> //# using core functions of cfitsio
|
||||
+#include <cfitsio/fitsio.h> //# header file from cfitsio
|
||||
+#include <cfitsio/fitsio2.h> //# using core functions of cfitsio
|
||||
}
|
||||
|
||||
#include <stdlib.h>
|
||||
@@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 13 13:26:33 UTC 2025 - Martin Jambor <mjambor@suse.com>
|
||||
|
||||
- Backport use_c17.patch from upstream to allow building with GCC 15.
|
||||
[boo#1244464]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 23 14:04:44 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 3.7.1:
|
||||
* Fix an issue in 'Stokes I Storage manager' when used on
|
||||
boolean columns (flag column) (gh#casacore/casacore#1407).
|
||||
* Fix a bug in Dysco when antenna indices are swapped
|
||||
(gh#casacore/casacore#1406).
|
||||
- Drop casacore-fitsio-header.patch: no longer needed for build.
|
||||
- Enable openmpi5 flavour.
|
||||
- Use fdupes to link duplicate files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 28 13:02:09 UTC 2024 - RN <R_Nik_C@proton.me>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package casacore
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,13 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
# ninja too old on openSUSE Leap 15.1
|
||||
%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150100
|
||||
%bcond_with ninja
|
||||
%else
|
||||
%global __builder ninja
|
||||
%bcond_without ninja
|
||||
%endif
|
||||
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
|
||||
@@ -66,18 +60,18 @@
|
||||
# /SECTION
|
||||
|
||||
Name: %{pname}
|
||||
Version: 3.6.1
|
||||
Version: 3.7.1
|
||||
Release: 0
|
||||
Summary: A suite of C++ libraries for radio astronomy data processing
|
||||
License: LGPL-2.0-or-later
|
||||
URL: https://github.com/casacore/casacore
|
||||
Source: https://github.com/casacore/casacore/archive/v%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
|
||||
Source99: casacore-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM casacore-fitsio-header.patch badshah400@gmail.com -- Fix location of cfitsio headers used in sources
|
||||
Patch1: casacore-fitsio-header.patch
|
||||
Patch1: use_c17.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: blas-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: fftw3-threads-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
@@ -86,6 +80,7 @@ BuildRequires: hdf5%{?my_suffix}-devel
|
||||
BuildRequires: lapack-devel
|
||||
BuildRequires: libboost_headers-devel
|
||||
BuildRequires: libboost_python3-devel
|
||||
BuildRequires: ninja
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-numpy-devel
|
||||
@@ -101,9 +96,6 @@ BuildRequires: %{mpi_flavor}%{?mpi_vers}-config
|
||||
BuildRequires: %{mpi_flavor}%{?mpi_vers}-devel
|
||||
BuildRequires: fftw3-openmp-devel
|
||||
%endif
|
||||
%if %{with ninja}
|
||||
BuildRequires: ninja
|
||||
%endif
|
||||
|
||||
%description
|
||||
Casacore provides a suite of C++ libraries for radio astronomy data processing.
|
||||
@@ -175,8 +167,9 @@ mkdir -p %{buildroot}%{my_libdir}/pkgconfig/
|
||||
mv %{buildroot}%{my_prefix}/lib/pkgconfig/*.pc %{buildroot}%{my_libdir}/pkgconfig/
|
||||
fi
|
||||
|
||||
%post -n %{shlib} -p /sbin/ldconfig
|
||||
%postun -n %{shlib} -p /sbin/ldconfig
|
||||
%fdupes %{buildroot}%{my_incdir}/casacore/
|
||||
|
||||
%ldconfig_scriptlets -n %{shlib}
|
||||
|
||||
%files
|
||||
%{my_bindir}/*
|
||||
|
||||
25
use_c17.patch
Normal file
25
use_c17.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
From c42188c3969e53e92765d14dab21da76c45d9a09 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andr=C3=A9=20Offringa?= <offringa@astron.nl>
|
||||
Date: Wed, 11 Jun 2025 17:20:24 +0200
|
||||
Subject: [PATCH] Require use of C17 to avoid C23 errors from gcc 15
|
||||
|
||||
---
|
||||
mirlib/CMakeLists.txt | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/mirlib/CMakeLists.txt b/mirlib/CMakeLists.txt
|
||||
index 0703a5d1d23..b8b6aac650c 100644
|
||||
--- a/mirlib/CMakeLists.txt
|
||||
+++ b/mirlib/CMakeLists.txt
|
||||
@@ -2,6 +2,11 @@
|
||||
# CASA Mirlib
|
||||
#
|
||||
|
||||
+# Part of the c files is not compiling yet in C23 mode, so require
|
||||
+# 17.
|
||||
+set(CMAKE_C_STANDARD 17)
|
||||
+set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
+
|
||||
add_library (
|
||||
casa_mirlib
|
||||
bug.c
|
||||
Reference in New Issue
Block a user