Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2025-04-10 21:59:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Rivet (Old) and /work/SRC/openSUSE:Factory/.Rivet.new.1907 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet" Thu Apr 10 21:59:01 2025 rev:30 rq:1268188 version:3.1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2025-03-25 22:18:36.718025041 +0100 +++ /work/SRC/openSUSE:Factory/.Rivet.new.1907/Rivet.changes 2025-04-10 21:59:29.557211982 +0200 @@ -1,0 +2,9 @@ +Wed Apr 9 13:51:38 UTC 2025 - Atri Bhattacharya <[email protected]> + +- 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 + +------------------------------------------------------------------- New: ---- Rivet-disable-testCmdLine.patch Rivet-fix-hepmc-tests.patch BETA DEBUG BEGIN: New: ca0d57ca to release-4-0-x development branch. - Add Rivet-disable-testCmdLine.patch -- Disable an outdated and failing test New: - Add Rivet-fix-hepmc-tests.patch -- Use deduce_reader in API tests for HepMC 3.3.x compatibility; part of upstream commit BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Rivet.spec ++++++ --- /var/tmp/diff_new_pack.auEJ9X/_old 2025-04-10 21:59:30.173237708 +0200 +++ /var/tmp/diff_new_pack.auEJ9X/_new 2025-04-10 21:59:30.173237708 +0200 @@ -26,6 +26,10 @@ 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 [email protected] -- Disable an outdated and failing test +Patch1: Rivet-disable-testCmdLine.patch +# PATCH-FIX-UPSTREAM Rivet-fix-hepmc-tests.patch [email protected] -- 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.9.11 BuildRequires: bash-completion @@ -37,6 +41,7 @@ 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 @@ %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 @@ 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 ++++++ Rivet-disable-testCmdLine.patch ++++++ 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 ++++++ --- 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; ++++++ sover.diff ++++++ --- /var/tmp/diff_new_pack.auEJ9X/_old 2025-04-10 21:59:30.249240883 +0200 +++ /var/tmp/diff_new_pack.auEJ9X/_new 2025-04-10 21:59:30.253241049 +0200 @@ -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 =
