Accepting request 1319261 from science

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

Rivet-3.1.10.tar.gz

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

Rivet-4.1.2.tar.bz2

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

Rivet-disable-testCmdLine.patch

@@ -0,0 +1,25 @@
+---
+ test/Makefile.am |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+Index: Rivet-4.1.2/test/Makefile.am
+===================================================================
+--- Rivet-4.1.2.orig/test/Makefile.am
++++ Rivet-4.1.2/test/Makefile.am
+@@ -60,11 +60,11 @@ testAnalysis testNaN.sh testBeams testMe
+ if ENABLE_PYEXT
+ TESTS += testImport.sh
+ 
+-if ENABLE_ANALYSES
+-
+-TESTS += testCmdLine.sh
+-
+-endif
++# if ENABLE_ANALYSES
++#
++# TESTS += testCmdLine.sh
++#
++# endif
+ endif
+ 
+ EXTRA_DIST = \

Rivet.changes

@@ -1,3 +1,92 @@
+-------------------------------------------------------------------
+Sun Nov 16 08:08:39 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 4.1.2:
+  * The LWTNN interface has been marked as to be deprecated in
+    preparation for future replacements.
+  * MET projections have been restructured to reduce code
+    duplication, with the SmearedMET projection now supporting
+    smearing of both vector pT and ET.
+  * Added pT-dependent b-tagging efficiency functions and ATLAS
+    Run-2 muon working points to detector-smearing functors.
+  * Streamlined handling of beam checks in multi-energy analyses
+    and improved re-entrant safety, including a unified ENERGY
+    option to override the nominal centre-of-mass energy.
+  * Fixed Particle::closestApproach() and improved the handling of
+    nominal weights when using --skip-weights.
+  * Rationalised units constants, removing ambiguous short symbols
+    and adding UK/US spellings (e.g. metre/meter).
+  * When running with --no-mcerrs, MC statistical errors are now
+    fully excluded from both error bars and uncertainty bands.
+  * Added a new MC_VERTEX validation routine to monitor vertex
+    positions, plus eight new measurement analyses from recent
+    collider results.
+- Changes from version 4.1.1:
+  * A same-flavour requirement is now enforced in the
+    DileptonFinder utility.
+  * An extended MC_WEIGHTS observable provides a differential
+    distribution of negative-weight events.
+  * Rivet now warns if analysis option ordering has to be
+    auto-corrected to canonical alphabetical form.
+  * Protections have been added to the DIS projection against
+    invalid (null) boost directions.
+  * Argument parsing has been reworked to support remote HepMC
+    sources (e.g. via xrootd).
+  * New and updated analyses from LHC and HERA.
+  * Event smearing can be disabled at runtime via the
+    RIVET_DISABLE_SMEARING=1 environment variable.
+  * The ONNXruntime interface is now templated to support both
+    float and double precision, with a new mkVecOf utility for
+    streamlined data preparation.
+- Changes from version 4.1.0:
+  * Update PID utils to MCUtils head, including a new
+    PID::isQuarkonium function from LHCb.
+  * Fix ProjectionApplier::hasProjection() to check against the
+    local projection-registration queue if its ProjectionHandler
+    is not yet bound.
+  * Remove FinalState::accept() method, which was misleading as
+    (as implemented) the subclasses did not override it and it
+    always just applied the stored ParticleFinder::_cuts rather
+    than augmenting those with the subclass semantics.
+  * Fix removed HDF5 variable expansion in rivet-config, and
+    improve terms reported for YODA (which provides HDF5) and
+    FastJet.
+  * Split MET smearing functions into SMEARPARAMS functions that
+    calculate the mean distorted vector and its energy resolution,
+    and the implementation of that smearing.
+- Changes from versions 4.0.0 through 4.0.3:
+  * Too many to list, see %{_docdir}/Rivet-devel/ChangeLog for a
+    full list.
+- Drop upstreamed patches:
+  * Rivet-fix-hepmc-tests.patch
+  * Rivet-include-missing-cstdint.patch
+- Rebase Rivet-disable-testCmdLine.patch for update.
+
+-------------------------------------------------------------------
+Thu Jul 10 22:56:17 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Add Rivet-include-missing-cstdint.patch: Include cstdint header
+  to fix build failures against GCC 15.
+
+-------------------------------------------------------------------
+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 and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,19 @@
 #
 
 
-%define ver 3.1.10
-%define so_name lib%{name}-%(echo %{ver} | tr '.' '_')
+%define so_name lib%{name}-%(echo %{version} | tr '.' '_')
 Name:           Rivet
-Version:        %{ver}
+Version:        4.1.2
 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
+URL:            https://gitlab.com/hepcedar/rivet/
+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
 BuildRequires:  HepMC-devel >= 3.2
-BuildRequires:  YODA-devel >= 1.8.0
+BuildRequires:  YODA-devel >= 2.0
 BuildRequires:  bash-completion
 BuildRequires:  fastjet-contrib-devel
 BuildRequires:  fastjet-devel
@@ -37,9 +38,11 @@ BuildRequires:  gcc-c++
 BuildRequires:  libboost_headers-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+BuildRequires:  python3-Cython
 BuildRequires:  python3-devel
 BuildRequires:  yaml-cpp-devel
 BuildRequires:  pkgconfig(gsl)
+BuildRequires:  pkgconfig(hdf5)
 BuildRequires:  pkgconfig(zlib)
 # i586 error due to conversion from `long long` to `size_t`
 ExcludeArch:    %ix86 %{arm}
@@ -140,8 +143,8 @@ rm rivet.pc
 
 # SECTION Fix/drop env based hashbangs in binaries as appropriate
 # Need to do this here rather than post-install in buildroot for tests in %%check to succeed
-sed -Ei "1s:^#!\s*%{_bindir}/env bash:#!/bin/bash:" ./bin/*
-sed -Ei "1s:^#!\s*%{_bindir}/env python:#!%{_bindir}/python3:" \
+sed -Ei "1s:^#!\s*/usr/bin/env bash:#!/bin/bash:" ./bin/*
+sed -Ei "1s:^#!\s*/usr/bin/env python3?$:#!%{_bindir}/python3:" \
   ./bin/* \
   ./pyext/build.py.in
 sed -E -i '1{/^#!.*env python/d}' \
@@ -151,12 +154,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 +191,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
@@ -202,9 +202,8 @@ export PYTHONPATH+=':%{buildroot}%{python3_sitearch}'
 
 %files devel
 %license COPYING
-%doc AUTHORS ChangeLog NEWS
+%doc ChangeLog README.md
 %{_bindir}/rivet-build
-%{_bindir}/rivet-buildplugin
 %{_bindir}/rivet-config
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
@@ -225,10 +224,10 @@ export PYTHONPATH+=':%{buildroot}%{python3_sitearch}'
 %{_bindir}/rivet-findid
 %{_bindir}/rivet-merge
 %{_bindir}/rivet-mkanalysis
+%{_bindir}/rivet-mkhepdata
 %{_bindir}/rivet-mkhtml
-%{_bindir}/rivet-mkhtml-mpl
+%{_bindir}/rivet-mkhtml-tex
 %{_bindir}/rivet-mkvaldir
-%{_bindir}/rivet-which
 %{python3_sitearch}/rivet/
 %{_datadir}/bash-completion/completions/*
 

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 =