Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package lalinspiral for openSUSE:Factory 
checked in at 2024-12-03 20:46:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lalinspiral (Old)
 and      /work/SRC/openSUSE:Factory/.lalinspiral.new.28523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lalinspiral"

Tue Dec  3 20:46:36 2024 rev:11 rq:1227915 version:5.0.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/lalinspiral/lalinspiral.changes  2024-09-15 
12:39:13.447610787 +0200
+++ /work/SRC/openSUSE:Factory/.lalinspiral.new.28523/lalinspiral.changes       
2024-12-03 20:47:45.308410586 +0100
@@ -1,0 +2,12 @@
+Sun Dec  1 07:00:56 UTC 2024 - Atri Bhattacharya <[email protected]>
+
+- Add lalinspiral-swig-stringval-not-value.patch: For
+  compatibility with swig 4.3.0, prefer 'stringval' before 'value'
+  attribute (upstream commit 9dba245a).
+
+-------------------------------------------------------------------
+Mon Nov 18 12:41:39 UTC 2024 - Atri Bhattacharya <[email protected]>
+
+- Fix use of %requires_eq with respect to octave.
+
+-------------------------------------------------------------------

New:
----
  lalinspiral-swig-stringval-not-value.patch

BETA DEBUG BEGIN:
  New:
- Add lalinspiral-swig-stringval-not-value.patch: For
  compatibility with swig 4.3.0, prefer 'stringval' before 'value'
BETA DEBUG END:

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

Other differences:
------------------
++++++ lalinspiral.spec ++++++
--- /var/tmp/diff_new_pack.Xqq19f/_old  2024-12-03 20:47:46.020440366 +0100
+++ /var/tmp/diff_new_pack.Xqq19f/_new  2024-12-03 20:47:46.024440534 +0100
@@ -42,6 +42,8 @@
 Group:          Productivity/Scientific/Physics
 URL:            https://wiki.ligo.org/Computing/LALSuite
 Source:         
https://software.igwn.org/sources/source/lalsuite/%{pname}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch0:         
https://git.ligo.org/lscsoft/lalsuite/-/commit/9dba245ab3692ecf691247a442704f13c075ed34.patch#/lalinspiral-swig-stringval-not-value.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module numpy-devel >= 1.7}
 BuildRequires:  fdupes
@@ -118,6 +120,7 @@
 This package contains sources and header files needed to build applications
 that use the LAL Inspiral library.
 
+%if %{with octave}
 %package -n octave-lalinspiral
 Summary:        Octave bindings for LAL Inspiral
 Group:          Productivity/Scientific/Physics
@@ -129,9 +132,11 @@
 
 %description -n octave-lalinspiral
 This package provides the necessary files for using LAL Inspiral with octave.
+%endif
 
 %prep
-%autosetup -p1 -n %{pname}-%{version}
+# Upstream commits are -p1 against the full lalsuite, but -p2 against 
individual lal* pkgs
+%autosetup -p2 -n %{pname}-%{version}
 
 %build
 %{python_expand # Necessary to run configure with multiple py3 flavors

++++++ lalinspiral-swig-stringval-not-value.patch ++++++
>From 9dba245ab3692ecf691247a442704f13c075ed34 Mon Sep 17 00:00:00 2001
From: Karl Wette <[email protected]>
Date: Thu, 24 Oct 2024 18:06:30 +1100
Subject: [PATCH] common/swig/generate_swig_iface.py: prefer "stringval" before
 "value" attribute

- As of SWIG 4.3.0 "value" attribute contains quote characters
- "stringval" attribute appears to still contain the raw string
---
 common/swig/generate_swig_iface.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/swig/generate_swig_iface.py 
b/common/swig/generate_swig_iface.py
index 530b026d5d..eaee2d41ce 100644
--- a/common/swig/generate_swig_iface.py
+++ b/common/swig/generate_swig_iface.py
@@ -195,9 +195,11 @@ class SwigSymbols(object):
         """Parse a swiglal macro
         """
         cdecl_name = get_swig_attr(cdecl, 'name')
-        cdecl_value = get_swig_attr(cdecl, 'value')
+        cdecl_value = get_swig_attr(cdecl, 'stringval')
         if not cdecl_value:
-            raise ValueError("cdecl '{}' has no value".format(cdecl_name))
+            cdecl_value = get_swig_attr(cdecl, 'value')
+            if not cdecl_value:
+                raise ValueError("cdecl '{}' has no value".format(cdecl_name))
         macro = re.sub(r'\s', '', cdecl_value)
         if cdecl_name == '__swiglal__':
             if macro in clear_macros:
-- 
GitLab

Reply via email to