Accepting request 1293787 from science

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

Rivet-3.1.11.tar.bz2

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

Rivet-4.1.2.tar.bz2

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

Rivet-disable-testCmdLine.patch

@@ -1,14 +1,10 @@
----
- test/Makefile.am |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: Rivet-4.1.2/test/Makefile.am
+Index: Rivet-3.1.11/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
+--- 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
 -
@@ -20,6 +16,6 @@ Index: Rivet-4.1.2/test/Makefile.am
 +# TESTS += testCmdLine.sh
 +#
 +# endif
- endif
  
- EXTRA_DIST = \
+ 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-include-missing-cstdint.patch

@@ -0,0 +1,16 @@
+---
+ include/Rivet/Tools/RivetSTL.hh |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: Rivet-3.1.11/include/Rivet/Tools/RivetSTL.hh
+===================================================================
+--- Rivet-3.1.11.orig/include/Rivet/Tools/RivetSTL.hh
++++ Rivet-3.1.11/include/Rivet/Tools/RivetSTL.hh
+@@ -12,6 +12,7 @@
+ #include <ostream>
+ #include <fstream>
+ #include <sstream>
++#include <cstdint>
+ // #include <tuple>
+ // #include <utility>
+ // #include <algorithm>

Rivet.changes

@@ -1,67 +1,3 @@
--------------------------------------------------------------------
-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>
 

Rivet.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package Rivet
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# 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,19 +16,24 @@
 #
 
 
-%define so_name lib%{name}-%(echo %{version} | tr '.' '_')
+%define ver 3.1.11
+%define so_name lib%{name}-%(echo %{ver} | tr '.' '_')
 Name:           Rivet
-Version:        4.1.2
+Version:        %{ver}
 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://gitlab.com/hepcedar/rivet/
+URL:            https://rivet.hepforge.org/
 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
+# PATCH-FIX-UPSTREAM Rivet-include-missing-cstdint.patch badshah400@gmail.com -- Include missing header cstdint to fix build failures against GCC 15
+Patch3:         Rivet-include-missing-cstdint.patch
 BuildRequires:  HepMC-devel >= 3.2
-BuildRequires:  YODA-devel >= 2.0
+BuildRequires:  YODA-devel >= 1.9.11
 BuildRequires:  bash-completion
 BuildRequires:  fastjet-contrib-devel
 BuildRequires:  fastjet-devel
@@ -42,7 +47,6 @@ 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}
@@ -143,8 +147,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*/usr/bin/env bash:#!/bin/bash:" ./bin/*
-sed -Ei "1s:^#!\s*/usr/bin/env python3?$:#!%{_bindir}/python3:" \
+sed -Ei "1s:^#!\s*%{_bindir}/env bash:#!/bin/bash:" ./bin/*
+sed -Ei "1s:^#!\s*%{_bindir}/env python:#!%{_bindir}/python3:" \
   ./bin/* \
   ./pyext/build.py.in
 sed -E -i '1{/^#!.*env python/d}' \
@@ -202,8 +206,9 @@ export PYTHONPATH+=':%{buildroot}%{python3_sitearch}'
 
 %files devel
 %license COPYING
-%doc ChangeLog README.md
+%doc AUTHORS ChangeLog NEWS
 %{_bindir}/rivet-build
+%{_bindir}/rivet-buildplugin
 %{_bindir}/rivet-config
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
@@ -224,10 +229,10 @@ export PYTHONPATH+=':%{buildroot}%{python3_sitearch}'
 %{_bindir}/rivet-findid
 %{_bindir}/rivet-merge
 %{_bindir}/rivet-mkanalysis
-%{_bindir}/rivet-mkhepdata
 %{_bindir}/rivet-mkhtml
-%{_bindir}/rivet-mkhtml-tex
+%{_bindir}/rivet-mkhtml-mpl
 %{_bindir}/rivet-mkvaldir
+%{_bindir}/rivet-which
 %{python3_sitearch}/rivet/
 %{_datadir}/bash-completion/completions/*