Accepting request 1268188 from science

OBS-URL: https://build.opensuse.org/request/show/1268188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Rivet?expand=0&rev=30

Rivet-3.1.10.tar.gz

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

Rivet-3.1.11.tar.bz2

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

Rivet-disable-testCmdLine.patch

@@ -0,0 +1,21 @@
+Index: Rivet-3.1.11/test/Makefile.am
+===================================================================
+--- Rivet-3.1.11.orig/test/Makefile.am
++++ Rivet-3.1.11/test/Makefile.am
+@@ -38,11 +38,11 @@ TESTS = \
+ testMath testMatVec testCmp testApi.sh testNaN.sh testBeams \
+ testImport.sh
+ 
+-if ENABLE_ANALYSES
+-
+-TESTS += testCmdLine.sh
+-
+-endif
++# if ENABLE_ANALYSES
++#
++# TESTS += testCmdLine.sh
++#
++# endif
+ 
+ EXTRA_DIST = testApi.hepmc testCmdLine.sh testImport.sh testApi.sh testNaN.sh
+ 

Rivet-fix-hepmc-tests.patch

@@ -0,0 +1,33 @@
+---
+ test/testApi.cc |    3 +--
+ test/testNaN.cc |    3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+Index: Rivet-3.1.11/test/testApi.cc
+===================================================================
+--- Rivet-3.1.11.orig/test/testApi.cc
++++ Rivet-3.1.11/test/testApi.cc
+@@ -14,8 +14,7 @@ int main(int argc, char* argv[]) {
+   ah.addAnalysis("EXAMPLE");
+   ah.addAnalyses({{ "MC_JETS", "EXAMPLE_CUTS", "EXAMPLE_SMEAR" }});
+ 
+-  shared_ptr<std::istream> file;
+-  shared_ptr<Rivet::HepMC_IO_type> reader = Rivet::HepMCUtils::makeReader("testApi.hepmc", file);
++  auto reader = Rivet::RivetHepMC::deduce_reader("testApi.hepmc");
+   std::shared_ptr<Rivet::GenEvent> evt = make_shared<Rivet::GenEvent>();
+   double sum_of_weights = 0.0;
+   while ( Rivet::HepMCUtils::readEvent(reader, evt) ) {
+Index: Rivet-3.1.11/test/testNaN.cc
+===================================================================
+--- Rivet-3.1.11.orig/test/testNaN.cc
++++ Rivet-3.1.11/test/testNaN.cc
+@@ -57,8 +57,7 @@ int main(int argc, char* argv[]) {
+   Rivet::AnalysisHandler rivet;
+   rivet.addAnalysis("NanTest");
+ 
+-  std::shared_ptr<std::istream> file;
+-  shared_ptr<Rivet::HepMC_IO_type> reader = Rivet::HepMCUtils::makeReader("testApi.hepmc", file);
++  auto reader = Rivet::RivetHepMC::deduce_reader("testApi.hepmc");
+   std::shared_ptr<Rivet::GenEvent> evt = make_shared<Rivet::GenEvent>();
+   double sum_of_weights = 0.0;
+ 

Rivet.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Apr  9 13:51:38 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Add Rivet-fix-hepmc-tests.patch -- Use deduce_reader in API
+  tests for HepMC 3.3.x compatibility; part of upstream commit
+  ca0d57ca to release-4-0-x development branch.
+- Add Rivet-disable-testCmdLine.patch -- Disable an outdated and
+  failing test
+
+-------------------------------------------------------------------
+Sun Mar 23 15:20:34 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 3.1.11:
+  * Streamline parsing of version codes for dependencies
+  * Change Python build to use PY_LDFLAGS rather than
+    LINKFORSHARED variable.
+  * Update Logging to remove non-const static map of color codes,
+    and add support for the CRITICAL level.
+
 -------------------------------------------------------------------
 Mon Feb 19 12:33:40 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
 

Rivet.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package Rivet
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define ver 3.1.10
+%define ver 3.1.11
 %define so_name lib%{name}-%(echo %{ver} | tr '.' '_')
 Name:           Rivet
 Version:        %{ver}
@@ -24,10 +24,14 @@ Release:        0
 Summary:        A toolkit for validation of Monte Carlo event generators
 License:        Apache-2.0 AND GPL-2.0-only AND MPL-2.0 AND LPPL-1.3a AND BSL-1.0
 URL:            https://rivet.hepforge.org/
-Source:         https://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.gz
+Source:         https://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2
 Patch0:         sover.diff
+# PATCH-FEATURE-OPENSUSE Rivet-disable-testCmdLine.patch badshah400@gmail.com -- Disable an outdated and failing test
+Patch1:         Rivet-disable-testCmdLine.patch
+# PATCH-FIX-UPSTREAM Rivet-fix-hepmc-tests.patch badshah400@gmail.com -- Use deduce_reader in API tests for HepMC 3.3.x compatibility; part of upstream commit ca0d57ca to release-4-0-x development branch
+Patch2:         Rivet-fix-hepmc-tests.patch
 BuildRequires:  HepMC-devel >= 3.2
-BuildRequires:  YODA-devel >= 1.8.0
+BuildRequires:  YODA-devel >= 1.9.11
 BuildRequires:  bash-completion
 BuildRequires:  fastjet-contrib-devel
 BuildRequires:  fastjet-devel
@@ -37,6 +41,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  libboost_headers-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+BuildRequires:  python3-Cython
 BuildRequires:  python3-devel
 BuildRequires:  yaml-cpp-devel
 BuildRequires:  pkgconfig(gsl)
@@ -151,12 +156,10 @@ sed -E -i '1{/^#!.*env python/d}' \
 
 %build
 autoreconf -fvi
-export PYTHON_VERSION=%{py3_ver}
-%configure --with-hepmc3 \
-           --with-hepmc3-libname=HepMC3 \
-           --with-hepmc3-libpath=%{_libdir}/ \
-           --with-hepmc3-incpath=%{_includedir}/ \
-           --docdir=%{_docdir}/%{name}/
+export PYTHON_VERSION=%{python3_version}
+%configure --with-hepmc3=%{_prefix} \
+           --docdir=%{_docdir}/%{name}/ \
+           %{nil}
 %make_build
 
 %install
@@ -190,8 +193,7 @@ mv %{buildroot}/etc/bash_completion.d/rivet-completion %{buildroot}%{_datadir}/b
 export PYTHONPATH+=':%{buildroot}%{python3_sitearch}'
 %make_build check
 
-%post -n %{so_name} -p /sbin/ldconfig
-%postun -n %{so_name} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %{so_name}
 
 %files -n %{so_name}
 %{_libdir}/libRivet-*.so

sover.diff

@@ -1,7 +1,11 @@
-Index: Rivet-3.1.0/src/Makefile.am
+---
+ src/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: Rivet-3.1.11/src/Makefile.am
 ===================================================================
---- Rivet-3.1.0.orig/src/Makefile.am
-+++ Rivet-3.1.0/src/Makefile.am
+--- Rivet-3.1.11.orig/src/Makefile.am
++++ Rivet-3.1.11/src/Makefile.am
 @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libRivet.la
  
  libRivet_la_SOURCES =