Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package lalsimulation for openSUSE:Factory 
checked in at 2026-06-28 21:06:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lalsimulation (Old)
 and      /work/SRC/openSUSE:Factory/.lalsimulation.new.11887 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lalsimulation"

Sun Jun 28 21:06:59 2026 rev:14 rq:1362023 version:6.2.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/lalsimulation/lalsimulation.changes      
2026-02-24 15:39:48.145408491 +0100
+++ /work/SRC/openSUSE:Factory/.lalsimulation.new.11887/lalsimulation.changes   
2026-06-28 21:07:33.952160034 +0200
@@ -1,0 +2,7 @@
+Sat Jun 27 11:45:33 UTC 2026 - Atri Bhattacharya <[email protected]>
+
+- Add lalsimulation-macro-redefinition.patch to undef macro before
+  its redefinition in an included header file and avoid
+  `macro-redefinition` error.
+
+-------------------------------------------------------------------

New:
----
  lalsimulation-macro-redefinition.patch

----------(New B)----------
  New:
- Add lalsimulation-macro-redefinition.patch to undef macro before
  its redefinition in an included header file and avoid
----------(New E)----------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lalsimulation.spec ++++++
--- /var/tmp/diff_new_pack.0iuJA0/_old  2026-06-28 21:07:34.528179443 +0200
+++ /var/tmp/diff_new_pack.0iuJA0/_new  2026-06-28 21:07:34.528179443 +0200
@@ -16,11 +16,6 @@
 #
 
 
-# NEP 29: python36-numpy and co. in TW are no more
-%define skip_python36 1
-# Py2 support dropped upstream
-%define skip_python2 1
-
 %define shlib liblalsimulation37
 # octave >= 6 not supported
 %bcond_with octave
@@ -31,6 +26,8 @@
 License:        GPL-2.0-only
 URL:            https://wiki.ligo.org/Computing/DASWG/LALSuite
 Source:         
https://software.igwn.org/sources/source/lalsuite/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM lalsimulation-macro-redefinition.patch 
[email protected] -- undef previously defined macro to prevent build 
failures when it is redefined in Python.h
+Patch0:         lalsimulation-macro-redefinition.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module lal >= 7.7.0}
 BuildRequires:  %{python_module numpy >= 1.7}
@@ -39,9 +36,6 @@
 BuildRequires:  help2man >= 1.37
 BuildRequires:  pkgconfig >= 0.18.0
 BuildRequires:  python-rpm-macros
-%if 0%{?suse_version} < 1550
-BuildRequires:  python-xml
-%endif
 BuildRequires:  swig >= 3.0.11
 BuildRequires:  pkgconfig(gsl)
 BuildRequires:  pkgconfig(lal) >= 7.7.0
@@ -104,7 +98,8 @@
 
 %prep
 # Upstream commits are -p1 against the full lalsuite, but -p2 against 
individual lal* pkgs
-%autosetup -p2
+%autosetup -N
+%patch -P0 -p1
 
 %build
 %{python_expand # Necessary to run configure with multiple py3 flavors
@@ -181,7 +176,7 @@
 %license COPYING
 %doc AUTHORS README.md
 %config %{_sysconfdir}/profile.d/%{name}.*
-%{_bindir}/*
+%{_bindir}/lalsim*
 %{_libdir}/*.so
 %{_includedir}/lal/
 %{_libdir}/pkgconfig/*

++++++ lalsimulation-macro-redefinition.patch ++++++
---
 lib/LALSimInspiralGeneratorPython.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: lalsimulation-6.2.0/lib/LALSimInspiralGeneratorPython.c
===================================================================
--- lalsimulation-6.2.0.orig/lib/LALSimInspiralGeneratorPython.c
+++ lalsimulation-6.2.0/lib/LALSimInspiralGeneratorPython.c
@@ -50,6 +50,13 @@ const LALSimInspiralGenerator lalPythonG
 #include <lal/LALSimSphHarmSeries.h>
 #include "LALSimInspiralWaveformParams_common.c"
 
+/*
+ * Macro _POSIX_C_SOURCE is already defined in `features.h` included via
+ * `LALStdlib.h`; so undef it before it is re-defined differently in `Python.h`
+ */
+#ifdef _POSIX_C_SOURCE
+#undef _POSIX_C_SOURCE
+#endif
 #include <Python.h>
 
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

Reply via email to