Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package trilinos for openSUSE:Factory
checked in at 2023-03-29 23:28:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trilinos (Old)
and /work/SRC/openSUSE:Factory/.trilinos.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trilinos"
Wed Mar 29 23:28:32 2023 rev:18 rq:1075325 version:14.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes 2022-10-12
18:28:29.690192222 +0200
+++ /work/SRC/openSUSE:Factory/.trilinos.new.31432/trilinos.changes
2023-03-29 23:28:37.503913914 +0200
@@ -1,0 +2,14 @@
+Tue Mar 28 19:46:26 UTC 2023 - Egbert Eich <e...@suse.com>
+
+- Update to version 14.0.0
+ For information on changes consult the release notes of
+ its sub-packages.
+ * Remove obsolete:
+ Fix-control-reaches-end-of-non-void-function-error.patch
+ Make-include-and-library-path-configurable-using-Cmake-variables.patch
+- Add Make-sure-standard-types-are-defined-in-c.patch:
+ Not app Trilinos package include the type definition they
+ require by rely on 'coinidential' inclusion. This can lead
+ to errors.
+
+-------------------------------------------------------------------
Old:
----
Fix-control-reaches-end-of-non-void-function-error.patch
Make-include-and-library-path-configurable-using-Cmake-variables.patch
trilinos-release-13-2-0.tar.gz
New:
----
Make-sure-standard-types-are-defined-in-c.patch
trilinos-release-14-0-0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trilinos.spec ++++++
--- /var/tmp/diff_new_pack.yAmrhJ/_old 2023-03-29 23:28:39.823926311 +0200
+++ /var/tmp/diff_new_pack.yAmrhJ/_new 2023-03-29 23:28:39.831926354 +0200
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,9 +22,9 @@
# Base package name
%define pname trilinos
-%define ver 13.2.0
-%define ver_exp 13-2-0
-%define so_ver 13
+%define ver 14.0.0
+%define ver_exp 14-0-0
+%define so_ver 14
%define PNAME %(echo %{pname} | tr [a-z] [A-Z])
%define _ver %(echo %{ver} | tr . _)
%define min_openblas_vers 0.3.6
@@ -38,7 +38,7 @@
%if 0%{?sle_version} >= 150200
%define DisOMPI1 ExclusiveArch: do_not_build
%endif
-%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200
+%if 0%{?sle_version:1} && 0%{?sle_version} < 150200
%define DisOMPI3 ExclusiveArch: do_not_build
%endif
%if 0%{?sle_version:1} && 0%{?sle_version} < 150300
@@ -356,7 +356,7 @@
%endif
%endif
-%if !0%{?is_opensuse} && !0%{?with_hpc:1}
+%if 0%{?sle_version} && !0%{?with_hpc:1}
ExclusiveArch: do_not_build
%endif
@@ -412,10 +412,9 @@
Group: Productivity/Scientific/Math
URL: http://trilinos.sandia.gov/index.html
Source0:
https://github.com/trilinos/Trilinos/archive/trilinos-release-%{ver_exp}.tar.gz
-Patch0: Fix-control-reaches-end-of-non-void-function-error.patch
Patch1: Convert-python2-isms-to-python3.patch
Patch2: Not-a-shell-script.patch
-Patch3:
Make-include-and-library-path-configurable-using-Cmake-variables.patch
+Patch3: Make-sure-standard-types-are-defined-in-c.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: hwloc-devel
@@ -446,6 +445,8 @@
BuildRequires:
%{mpi_family}%{?mpi_ext}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
# Fix this once boost is available as a HPC version
BuildRequires: boost-devel
+BuildRequires: libboost_program_options-devel
+BuildRequires: libboost_system-devel
#BuildRequires: boost-%%{compiler_family}-hpc-devel
BuildRequires: hdf5-%{compiler_family}-%{mpi_family}%{?mpi_ext}-hpc-devel
BuildRequires: libopenblas-%{compiler_family}-hpc >= %{min_openblas_vers}
@@ -459,6 +460,8 @@
BuildRequires: gcc-fortran
BuildRequires: glpk-devel
BuildRequires: lapack-devel
+BuildRequires: libboost_program_options-devel
+BuildRequires: libboost_system-devel
BuildRequires: libmatio-devel
BuildRequires: mumps-devel
BuildRequires: openblas-devel
@@ -689,7 +692,6 @@
-DBoost_INCLUDE_DIRS:PATH="${BOOST_INC}" \
-DBoost_LIBRARY_DIRS:PATH="${BOOST_LIB}" \
%endif
- -DBoost_LIBRARY_NAMES:STRING="boost" \
-DTPL_ENABLE_Pthread:BOOL=ON \
-DTPL_ENABLE_CppUnit:BOOL=OFF \
-DTPL_ENABLE_Zlib:BOOL=ON \
@@ -728,10 +730,6 @@
%{?with_hpc:%hpc_setup_mpi}
%cmake_install
mkdir -p %{buildroot}%p_python_sitelib/%pname
-# Python2 is history
-rm -f %{buildroot}%{p_prefix}/lib/*2.py
-mv %{buildroot}%{p_prefix}/lib/*.py %{buildroot}%{p_python_sitelib}/%pname
-chmod a-x %{buildroot}%{p_python_sitelib}/%pname/*.py
%if %{with hpc}
%hpc_shebang_sanitize_scripts %{buildroot}%{p_libdir}/cmake
@@ -788,6 +786,14 @@
%{?with_hpc:%{hpc_shebang_sanitize_scripts %{buildroot}/%{p_libdir}/cmake}}
%{?with_hpc:%{hpc_shebang_sanitize_scripts %{buildroot}/%{p_bindir}}}
%{?with_hpc:%{hpc_shebang_sanitize_scripts doc/}}
+%if !0%{?with_hpc:1}
+for file in "%{buildroot}/%{p_bindir}/hpcbind" $(find
%{buildroot}/%{p_bindir} %{buildroot}/%{p_libdir}/cmake -name "*.py" -type f);
do
+ case $(head -1 $file) in
+ \#\!*bin/env\ *python*) sed -i "1s,^.*,#! /usr/bin/python3," $file ;;
+ \#\!*bin/env\ *bash*) sed -i "1s,^.*,#! /usr/bin/bash," $file ;;
+ esac
+done
+%endif
for i in $(find %{buildroot}/%{p_libdir}/cmake -name "*.sh" -o -name "*.py");
do
head -1 $i | grep -qE "#! */" && chmod 0755 $i
done
@@ -818,6 +824,7 @@
%files devel
%{p_includedir}
%{p_libdir}/cmake
+%{p_libdir}/external_packages
%{p_libdir}/*.so
%{p_bindir}%{!?hpc:/*}
%{?with_hpc:%dir %{p_python_sitelib}}
++++++ Make-sure-standard-types-are-defined-in-c.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Tue Mar 28 15:26:46 2023 +0200
Subject: Make sure standard types are defined in c++
Patch-mainline: Not yet
Git-commit: fee639a48f18d81f81d4f6053122a47557eaf37d
References:
Signed-off-by: Egbert Eich <e...@suse.com>
Signed-off-by: Egbert Eich <e...@suse.de>
---
packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
b/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
index e82e8be9..b41b0d03 100644
--- a/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
+++ b/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
@@ -43,6 +43,7 @@
#define TEUCHOS_BIG_UINT_DECL_HPP
#include <iosfwd>
+#include <cstdint>
/*! \file Teuchos_BigUIntDecl.hpp
\brief Arbitrary-precision unsigned integer declaration.
++++++ trilinos-release-13-2-0.tar.gz -> trilinos-release-14-0-0.tar.gz ++++++
/work/SRC/openSUSE:Factory/trilinos/trilinos-release-13-2-0.tar.gz
/work/SRC/openSUSE:Factory/.trilinos.new.31432/trilinos-release-14-0-0.tar.gz
differ: char 12, line 1
