[rpms/lfortran] epel10: Version bump to v0.31.0 (bug #2259671)

[rpms/lfortran] epel10: Version bump to v0.31.0 (bug #2259671)

[Christoph Junghans]

A new commit has been pushed.

Repo   : rpms/lfortran
Branch : epel10
Commit : 244f3d5211997afdd4c160d91380ebfdac22d43c
Author : Christoph Junghans <junghans@votca.org>
Date   : 2024-01-22T10:10:12-07:00
Stats  : +24/-81 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/lfortran/c/244f3d5211997afdd4c160d91380ebfdac22d43c?branch=epel10

Log:
Version bump to v0.31.0 (bug #2259671)

---
diff --git a/.gitignore b/.gitignore
index 959b137..ce112bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /lfortran-0.30.0.tar.gz
+/lfortran-0.31.0.tar.gz

diff --git a/3043.patch b/3043.patch
deleted file mode 100644
index 863592a..0000000
--- a/3043.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From b7839664b54f515ed52aa0068d795685e4a6aad1 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Thu, 4 Jan 2024 16:00:04 -0700
-Subject: [PATCH 1/2] cmake: add libm to lfortran_runtime
-
----
- src/runtime/legacy/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt
-index 03ef4f6425..6da9013888 100644
---- a/src/runtime/legacy/CMakeLists.txt
-+++ b/src/runtime/legacy/CMakeLists.txt
-@@ -2,9 +2,13 @@ set(SRC
-     ../../../src/libasr/runtime/lfortran_intrinsics.c
- )
- 
-+set(MATH_LIBRARIES "m" CACHE STRING "math library")
-+mark_as_advanced( MATH_LIBRARIES )
-+
- add_library(lfortran_runtime SHARED ${SRC})
- target_include_directories(lfortran_runtime BEFORE PUBLIC ${libasr_SOURCE_DIR}/..)
- target_include_directories(lfortran_runtime BEFORE PUBLIC ${libasr_BINARY_DIR}/..)
-+target_link_libraries(lfortran_runtime PRIVATE ${MATH_LIBRARIES})
- set_target_properties(lfortran_runtime PROPERTIES
-   VERSION ${PROJECT_VERSION}
-   SOVERSION ${PROJECT_VERSION_MAJOR})
-@@ -14,6 +18,7 @@ set_target_properties(lfortran_runtime PROPERTIES
- add_library(lfortran_runtime_static STATIC ${SRC})
- target_include_directories(lfortran_runtime_static BEFORE PUBLIC ${libasr_SOURCE_DIR}/..)
- target_include_directories(lfortran_runtime_static BEFORE PUBLIC ${libasr_BINARY_DIR}/..)
-+target_link_libraries(lfortran_runtime PRIVATE ${MATH_LIBRARIES})
- set_target_properties(lfortran_runtime_static PROPERTIES
-     LIBRARY_OUTPUT_DIRECTORY ..)
- 
-
-From f28ae4a58bd0851f378c0f27e6ffde7e1833b901 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Thu, 4 Jan 2024 16:42:26 -0700
-Subject: [PATCH 2/2] cmake: fix build on WIndows
-
----
- src/runtime/legacy/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/runtime/legacy/CMakeLists.txt b/src/runtime/legacy/CMakeLists.txt
-index 6da9013888..0c80f9daf9 100644
---- a/src/runtime/legacy/CMakeLists.txt
-+++ b/src/runtime/legacy/CMakeLists.txt
-@@ -2,7 +2,11 @@ set(SRC
-     ../../../src/libasr/runtime/lfortran_intrinsics.c
- )
- 
--set(MATH_LIBRARIES "m" CACHE STRING "math library")
-+if(WIN32)
-+  set(MATH_LIBRARIES "" CACHE STRING "math library")
-+else()
-+  set(MATH_LIBRARIES "m" CACHE STRING "math library")
-+endif()
- mark_as_advanced( MATH_LIBRARIES )
- 
- add_library(lfortran_runtime SHARED ${SRC})

diff --git a/lfortran.spec b/lfortran.spec
index edf1447..8f9ef89 100644
--- a/lfortran.spec
+++ b/lfortran.spec
@@ -1,6 +1,6 @@
-Version:        0.30.0
+Version:        0.31.0
 Name:           lfortran
-Release:        9%{?dist}
+Release:        1%{?dist}
 Summary:        A modern Fortran compiler
 
 # Main code is BSD-3-Clause
@@ -9,11 +9,15 @@ Summary:        A modern Fortran compiler
 License:        BSD-3-Clause AND Apache-2.0 WITH LLVM-exception
 URL:            https://lfortran.org/
 Source0:        https://lfortran.github.io/tarballs/release/lfortran-%{version}.tar.gz
-# fix missing symbols in runtime library
-Patch0:         https://github.com/lfortran/lfortran/pull/3043.patch
 # https://github.com/lfortran/lfortran/issues/2981
 ExclusiveArch: x86_64
 
+%global with_jupyter 1
+%if 0%{?fedora} < 39
+# F38 has no jupyterlab
+%global with_jupyter 0
+%endif
+
 BuildRequires: binutils-devel
 BuildRequires: bison
 BuildRequires: cmake
@@ -23,13 +27,11 @@ BuildRequires: json-devel
 BuildRequires: libffi-devel
 BuildRequires: libunwind-devel
 BuildRequires: libuuid-devel
-%if 0%{?fedora} == 38
-BuildRequires: llvm-devel
-%else
+%if 0%{?fedora} > 38
 BuildRequires: llvm16-devel
+%else
+BuildRequires: llvm-devel
 %endif
-BuildRequires: libzstd-devel
-BuildRequires: libzstd-static
 BuildRequires: python3-devel
 BuildRequires: rapidjson-devel
 BuildRequires: re2c
@@ -40,6 +42,7 @@ BuildRequires: zlib-ng-compat-static
 BuildRequires: zlib-devel
 BuildRequires: zlib-static
 %endif
+%if %{with_jupyter}
 # Needed for Jupyter kernel
 BuildRequires: cppzmq-devel
 BuildRequires: json-devel
@@ -47,8 +50,7 @@ BuildRequires: openssl-devel
 BuildRequires: xeus-devel
 BuildRequires: xeus-zmq-devel
 BuildRequires: xtl-devel
-# For manpage, drop in next release
-BuildRequires: pandoc
+%endif
 # For backend=cpp
 BuildRequires: kokkos-devel
 # Not explicitly linked, hence listed here
@@ -91,8 +93,7 @@ Summary:   Shared runtime library for %{name}
 
 This package contains shared runtime library for %{name}.
 
-# F38 has no jupyterlab
-%if 0%{?fedora} > 38
+%if %{with_jupyter}
 %package jupyter
 Summary:   Jupyter kernel for %{name}
 Requires:  %{name}%{?_isa} = %{version}-%{release}
@@ -110,6 +111,8 @@ This package contains the jupyter kernel for %{name}.
 %autosetup -p1
 
 %build
+# WITH_ZSD is just used to fix static linking of llvm
+# not needed on Fedora
 %cmake -DCMAKE_PREFIX_PATH=%{_libdir}/llvm16/ \
        -DWITH_LLVM=ON \
        -DWITH_RUNTIME_LIBRARY=ON \
@@ -120,15 +123,13 @@ This package contains the jupyter kernel for %{name}.
        -DWITH_TARGET_WASM=ON \
        -DWITH_UNWIND=ON \
        -DWITH_WHEREAMI=OFF \
-       -DWITH_XEUS=ON \
+       -DWITH_ZSTD=OFF \
+       -DWITH_XEUS=%{with_jupyter} \
        -DWITH_ZLIB=ON
 %cmake_build
 
 %install
 %cmake_install
-%if 0%{?fedora} == 38
-%{__rm} -rfv %{buildroot}%{_datadir}/jupyter/kernels
-%endif
 
 %check
 %ctest
@@ -152,13 +153,16 @@ This package contains the jupyter kernel for %{name}.
 %files shared
 %{_libdir}/liblfortran_runtime.so.*
 
-%if 0%{?fedora} > 38
+%if %{with_jupyter}
 %files jupyter
 %dir %{_datadir}/jupyter/kernels/fortran
 %{_datadir}/jupyter/kernels/fortran/kernel.json
 %endif
 
 %changelog
+* Mon Jan 22 2024 Christoph Junghans <junghans@votca.org> - 0.31.0-1
+- Version bump to v0.31.0 (bug #2259671)
+
 * Fri Jan 19 2024 Christoph Junghans <junghans@votca.org> - 0.30.0-9
 - Drop jupyter package on F38
 

diff --git a/sources b/sources
index cb93757..d06c98a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lfortran-0.30.0.tar.gz) = cc333cb449823f29ba36a56e200f2f3f74fc8b14d6f618ef82557a8af5bd38f2cf150723af0e466a5391e92181b4a9347aaceb6745f70ee38bbdd0fb46e1f67f
+SHA512 (lfortran-0.31.0.tar.gz) = acf3ac462a655467f893b102feb738f9b4d10cf850ac59a6efb28549ff32f8bedda09bb1fb26a623504574b3f72a632051387bf6fde6ecc81f48963174c73885