Accepting request 1319263 from science

OBS-URL: https://build.opensuse.org/request/show/1319263
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SHERPA-MC?expand=0&rev=23

SHERPA-MC-2.2.15.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df3bcb6b593f6e6eee396294b13c90337f5c3c15c92651753a03e0ce7975864b
-size 9192614

SHERPA-MC-2.2.16.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:027b52379061b4916e0c1a0e16faf3a02aff5b84a75f909e017893733f4c8d4b
+size 9215156

SHERPA-MC-fix-rivet-libs-check.patch

@@ -0,0 +1,17 @@
+---
+ m4/acinclude.m4 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: SHERPA-MC-2.2.16/m4/acinclude.m4
+===================================================================
+--- SHERPA-MC-2.2.16.orig/m4/acinclude.m4
++++ SHERPA-MC-2.2.16/m4/acinclude.m4
+@@ -517,7 +517,7 @@ AC_DEFUN([SHERPA_SETUP_CONFIGURE_OPTIONS
+             fi;;
+       esac;
+       if test -x "$CONDITIONAL_RIVETDIR/bin/rivet-config"; then
+-        CONDITIONAL_RIVETLDADD="$($CONDITIONAL_RIVETDIR/bin/rivet-config --ldflags) $($CONDITIONAL_RIVETDIR/bin/rivet-config --ldadd)";
++        CONDITIONAL_RIVETLDADD="$($CONDITIONAL_RIVETDIR/bin/rivet-config --libs)";
+         CONDITIONAL_RIVETCPPFLAGS="$($CONDITIONAL_RIVETDIR/bin/rivet-config --cppflags)";
+         AC_MSG_RESULT([${CONDITIONAL_RIVETDIR}]);
+         rivetversion="$($CONDITIONAL_RIVETDIR/bin/rivet-config --version)"

SHERPA-MC-ignore-distutils-deprecation-warning.patch

@@ -1,13 +0,0 @@
-Index: SHERPA-MC-2.2.12/m4/ax_python_devel.m4
-===================================================================
---- SHERPA-MC-2.2.12.orig/m4/ax_python_devel.m4
-+++ SHERPA-MC-2.2.12/m4/ax_python_devel.m4
-@@ -136,7 +136,7 @@ variable to configure. See ``configure -
- 	# Check if you have distutils, else fail
- 	#
- 	AC_MSG_CHECKING([for the distutils Python package])
--	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-+	ac_distutils_result=`$PYTHON -c "import warnings; warnings.simplefilter('ignore'); import distutils" 2>&1`
- 	if test -z "$ac_distutils_result"; then
- 		AC_MSG_RESULT([yes])
- 	else

SHERPA-MC.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sun Nov 16 18:18:24 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 2.2.16:
+  * Fix: reverts a change introduced in 2.2.13 which affects
+    MC@NLO/MEPS@NLO cross sections when using an Enhance_Factor
+    that is not equal to the default value of 1
+  * Fix C++20 compilation error (also note that C++11 is now
+    required explicitly).
+  * Fix errors on some systems when using Sherpa's Python
+    extensions.
+  * Enable Rivet 4 support.
+  * Update MCFM interface documentation.
+  * Remove obsolete Order_EW setting from some examples.
+- Drop SHERPA-MC-ignore-distutils-deprecation-warning.patch: fixed
+  upstream.
+- Add SHERPA-MC-fix-rivet-libs-check.patch: fix configure check
+  for rivet >= 4.0
+
 -------------------------------------------------------------------
 Mon Mar 24 04:23:58 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
 

SHERPA-MC.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package SHERPA-MC
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define _lto_cflags %{nil}
 
 Name:           SHERPA-MC
-Version:        2.2.15
+Version:        2.2.16
 Release:        0
 Summary:        MC event generator for Simulation of High-Energy Reactions of PArticles
 License:        GPL-2.0-or-later AND GPL-3.0-only
@@ -30,13 +30,12 @@ URL:            https://sherpa-team.gitlab.io/
 Source:         https://www.hepforge.org/downloads/sherpa/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch badshah400@gmail.com -- Fix a non-void (bool) function that was not returning any data to return "true"
 Patch0:         SHERPA-MC-no-return-in-non-void-function.patch
-# PATCH-FIX-UPSTREAM SHERPA-MC-ignore-distutils-deprecation-warning.patch badshah400@gmail.com -- Disable deprecation warning when importing distutils from python3.10, so that autotools can still work
-Patch1:         SHERPA-MC-ignore-distutils-deprecation-warning.patch
 # PATCH-FIX-UPSTREAM SHERPA-MC-swig-noruntime.patch badshah400@gmail.com -- Drop `-noruntime` from swig command line
 Patch2:         SHERPA-MC-swig-noruntime.patch
+# PATCH-FIX-OPENSUSE SHERPA-MC-fix-rivet-libs-check.patch badshah400@gmail.com -- Fix configure check for rivet >= 4.0
+Patch3:         SHERPA-MC-fix-rivet-libs-check.patch
 BuildRequires:  HepMC-devel >= 3.0
 BuildRequires:  LHAPDF-devel
-BuildRequires:  Rivet-devel
 BuildRequires:  fastjet-contrib-devel
 BuildRequires:  fastjet-devel
 BuildRequires:  fastjet-plugin-siscone-devel
@@ -52,6 +51,7 @@ BuildRequires:  python3-setuptools
 BuildRequires:  sqlite3-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig(gsl)
+BuildRequires:  pkgconfig(rivet)
 BuildRequires:  pkgconfig(yaml-cpp)
 BuildRequires:  pkgconfig(zlib)
 
@@ -156,14 +156,14 @@ autoreconf -fvi
   --enable-ufo                 \
   --enable-pyext               \
   --enable-analysis            \
-  --enable-multithread         \
   --enable-gzip                \
   --disable-hepmc3root         \
   --enable-hepmc3=%{_prefix}   \
   --enable-fastjet=%{_prefix}  \
   --enable-lhapdf=%{_prefix}   \
+  --enable-pythia=%{_prefix}   \
   --enable-rivet=%{_prefix}    \
-  --enable-pythia=%{_prefix}
+  %{nil}
 
 %make_build
 
@@ -178,9 +178,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %fdupes %{buildroot}%{_datadir}/%{name}/
 %fdupes %{buildroot}%{python3_sitelib}/
 
-%post -n %{soname} -p /sbin/ldconfig
-
-%postun -n %{soname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %{soname}
 
 %files -n %{soname}
 %dir %{_libdir}/%{name}