Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package suse-hpc for openSUSE:Factory
checked in at 2023-10-27 22:29:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-hpc (Old)
and /work/SRC/openSUSE:Factory/.suse-hpc.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-hpc"
Fri Oct 27 22:29:00 2023 rev:29 rq:1120762 version:0.5.20231026.36e049d
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-hpc/suse-hpc.changes 2023-10-24
20:09:27.054910344 +0200
+++ /work/SRC/openSUSE:Factory/.suse-hpc.new.17445/suse-hpc.changes
2023-10-27 22:29:41.246802668 +0200
@@ -1,0 +2,11 @@
+Thu Oct 26 21:07:33 UTC 2023 - Egbert Eich <e...@suse.com>
+
+- Previous fix did not work, revert and use %global instead of
+ %define.
+ The %hpc_cmake and %hpc_ninja macros wrap the %cmake and %ninja macros.
+ The wrapper needs to set all standard variables passed to cmake in these
+ macros to the hpc values.
+ With the mentioned macros this leads to an infinite recursion if using
+ %define. So we use %global instead.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-hpc.spec ++++++
--- /var/tmp/diff_new_pack.YCZYUl/_old 2023-10-27 22:29:41.982829663 +0200
+++ /var/tmp/diff_new_pack.YCZYUl/_new 2023-10-27 22:29:41.982829663 +0200
@@ -20,7 +20,7 @@
License: BSD-3-Clause
Group: Productivity/Clustering/Computing
Name: suse-hpc
-Version: 0.5.20231024.0226cb7
+Version: 0.5.20231026.36e049d
Release: 0
Source0: macros.hpc
Source1: dlinfo.c
++++++ _service ++++++
--- /var/tmp/diff_new_pack.YCZYUl/_old 2023-10-27 22:29:42.022831130 +0200
+++ /var/tmp/diff_new_pack.YCZYUl/_new 2023-10-27 22:29:42.026831276 +0200
@@ -6,7 +6,7 @@
<param name="exclude">.git</param>
<param name="filename">suse-hpc</param>
<param name="versionformat">0.5.%cd.%h</param>
- <param name="revision">87c7989e7349d543ba33aada425716f6ffcba0fb</param>
+ <param name="revision">36e049da8d5c8bab1e78e15d7a26c91b58b12ff5</param>
<param name="extract">general/dlinfo.c</param>
<param name="extract">general/macros.hpc</param>
<param name="extract">general/hpc_elf.pl</param>
++++++ macros.hpc ++++++
--- /var/tmp/diff_new_pack.YCZYUl/_old 2023-10-27 22:29:42.086833477 +0200
+++ /var/tmp/diff_new_pack.YCZYUl/_new 2023-10-27 22:29:42.086833477 +0200
@@ -741,15 +741,11 @@
%define _infodir %{hpc_infodir} \
%define _libdir %{hpc_libdir} \
%define _libexecdir %{hpc_libexecdir} \
- %if x%{?hpc_localstatedir} != x%{_localstatedir} \
- %define _localstatedir %{hpc_localstatedir} \
- %endif \
+ %global _localstatedir %{hpc_localstatedir} \
%define _mandir %{hpc_mandir} \
%define _prefix %{hpc_prefix} \
%define _sbindir %{hpc_sbindir} \
- %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
- %define _sharedstatedir %{hpc_sharedstatedir} \
- %endif \
+ %global _sharedstatedir %{hpc_sharedstatedir} \
#Do NOT define _sysconfig to %%hpc_sysconfig here!
%cmake \\\
%undefine __cmake \\\
@@ -759,15 +755,11 @@
%undefine _infodir \\\
%undefine _libdir \\\
%undefine _libexecdir \\\
- %if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
%undefine _localstatedir \\\
- %endif \\\
%undefine _mandir \\\
%undefine _prefix \\\
%undefine _sbindir \\\
- %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
%undefine _sharedstatedir \\\
- %endif \\\
}
# wraps macro from macros.meson - paths replaced by HPC paths.
@@ -781,15 +773,11 @@
%define _infodir %{hpc_infodir} \
%define _libdir %{hpc_libdir} \
%define _libexecdir %{hpc_libexecdir} \
- %if x%{?hpc_localstatedir} != x%{_localstatedir} \
- %define _localstatedir %{hpc_localstatedir} \
- %endif \
+ %global _localstatedir %{hpc_localstatedir} \
%define _mandir %{hpc_mandir} \
%define _prefix %{hpc_prefix} \
%define _sbindir %{hpc_sbindir} \
- %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
- %define _sharedstatedir %{hpc_sharedstatedir} \
- %endif \
+ %global _sharedstatedir %{hpc_sharedstatedir} \
%define _sysconfdir %{hpc_sysconfdir} \
%meson \\\
%undefine __meson \\\
@@ -799,15 +787,11 @@
%undefine _infodir \\\
%undefine _libdir \\\
%undefine _libexecdir \\\
- %if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
%undefine _localstatedir \\\
- %endif \\\
%undefine _mandir \\\
%undefine _prefix \\\
%undefine _sbindir \\\
- %if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
%undefine _sharedstatedir \\\
- %endif \\\
%undefine _sysconfdir \\\
}
