Hello community, here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2020-01-17 16:04:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Rivet (Old) and /work/SRC/openSUSE:Factory/.Rivet.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet" Fri Jan 17 16:04:12 2020 rev:16 rq:765274 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2019-08-27 10:22:13.443936219 +0200 +++ /work/SRC/openSUSE:Factory/.Rivet.new.26092/Rivet.changes 2020-01-17 16:04:16.424408443 +0100 @@ -1,0 +2,93 @@ +Fri Jan 17 13:11:50 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Add Obsoletes: python-Rivet to python3-Rivet to help migration. + +------------------------------------------------------------------- +Wed Jan 8 21:55:34 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Update to version 3.1.0 (new upstream recommended version): + * Projections/EventMixingFinalState.hh: Replace use of + std::random_shuffle (deprecated in C++14, removed in C++17) + with std::shuffle and direct access to our thread-safe random + number generator. + * Significant revisions to tau jet efficiency functions. + * Add JET_EFF_ONE/ZERO aliases, cf. the Particle versions. + * Give precedence to user-supplied cross-section + * Switch required compiler dialect to C++14, to ensure that + compiler definitely (?) supports required C++11. C++14 or 17 + is the current standard LCG build dialect. + * Add decay angle to ARGUS_1989_I268577 + * Add polarization to OPAL_1997_S3608263 + * Fixes to headers and brefi descriptions in various analyses + * Add CMD3_2019_I1770428 K0S K0S pi+ pi- cross section + * Fix histogram ids in BELLE_2009_I809630 + * Add TMP to histogram labels in ARGUS_1993_S2669951 + * Formally require YODA >= 1.8.0 in configure. + * Add new ALEPH analyses + * Fixes for pointers, booking in TASSO_1990_I284251 and + TASSO_1982_I177174 + * Added MARKI_1976_I109792, DASP_1979_I132045 particle spectra + at low energies + * Added DASP_1979_I132410 eta production at low energies + * Added BABAR_2006_I719111 particle specta in B decays + * Added OPAL_2001_I536266 flavour separate charge particle + multiplicites + * Added new CLEO and CUSB analyses + * Added new BELLE lambda polarization and ARGUS D spectra + * Fix issues with ARGUS_1992_I319102, CLEO_2000_I537236 + * Added new DELPHI analyses + * Added L3_1995_I381046, B*/B ratio + * Added new OPAL analyses + * Added new BES analyses + * Added new CMD3 analyses + * Added ARGUS_1988_I261672 for sigmac production + * Added LHCB_2013_I1243156, ARGUS_1989_I280943, + BABAR_2010_I867611 helicity angles for excited D meson decays + * Added TPC_1991_I316132, HRS_1987_I250823 D* polarization at 29 + GeV + * Added VENUS_1998_I453613, TOPAZ_1997_I454183 charged particles + at 58 GeV + * ATLAS_2011_S9128077 ensure all bins outputted in d02, + otherwise problems with yodamerge + * ATLAS_2015_I1393758 and ATLAS_2016_I1419070, + * CMS_2012_I1111014, change numEntries -> effNumEntries to avoid + issues in NLO runs + * Change ratio plot label, was wrong way up, in + * ATLAS_2012_I1203852, ATLAS_2013_I1190187 + * Use rivet normalize not yoda in ATLAS_2018_I1711114 to avoid + issues if histos empty + * Avoid crash in ATLAS_2016_I1426523 if host not found + * Add omega hist in BABAR_2017_I1621593 + * EHS_1988_I265504 fix rapidity calc so in CMS not lab + * A2_2017_I1486671 fix omega PDG number + * Re-enable custom Particles and Jets vectors, with moms() and + other conversion functions. + * Add default ANY decay mode to TauFinder. + * Pass HepMC3 path info through to the rivet-config script. + * Refine testing and printing of UNVALIDATED status in analysis + listing. + * Add INF to the list of predefined constants, and rename the + internal constants header. + * Improve normalization guidance and fix energy specification in + mkanalysis .info file template. +- Changes from version 3.0.0 through 3.0.2: See + https://gitlab.com/hepcedar/rivet/blob/release-3-0-x/ChangeLog. +- Switch to python3: + * Requires and BuildRequires switched to python3 versions + * Rename python package to python3-%{name} and provide + python-%{name} from it; this makes the py3 switch clear to + users. + * Explicitly pass PYTHON_VERSION as py3 version to make it build + against python3 +- Build against HepMC3 instead of HepMC2: + * Adapt BuildRequires for HepMC3. + * Pass HepMC3 specific parameters to configure. + * Add Rivet-plugins-use-HepMC3.patch: Port an analysis plugin to + HepMC3 from HepMC2 +- Refresh sover.diff for updated version. +- Drop Rivet-fix-ambiguous-namespace.patch: incorporated upstream +- New BuildRequires: rsync, fastjet-contrib-devel +- Update required version of YODA-devel to 1.8.0. +- Drop conditionals for outdated openSUSE versions. + +------------------------------------------------------------------- Old: ---- Rivet-2.7.2.tar.bz2 Rivet-fix-ambiguous-namespace.patch New: ---- Rivet-3.1.0.tar.gz Rivet-plugins-use-HepMC3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Rivet.spec ++++++ --- /var/tmp/diff_new_pack.GyKvhf/_old 2020-01-17 16:04:17.980409178 +0100 +++ /var/tmp/diff_new_pack.GyKvhf/_new 2020-01-17 16:04:17.984409180 +0100 @@ -1,7 +1,7 @@ # # spec file for package Rivet # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,37 +16,36 @@ # -%define so_name lib%{name}-2_7_2 +%define so_name lib%{name}-3_1_0 Name: Rivet -Version: 2.7.2 +Version: 3.1.0 Release: 0 Summary: A toolkit for validation of Monte Carlo event generators License: GPL-2.0-only Group: Productivity/Scientific/Physics -URL: http://rivet.hepforge.org/ -Source: http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2 +URL: https://rivet.hepforge.org/ +Source: http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.gz Patch0: sover.diff -# PATCH-FIX-UPSTREAM Rivet-fix-ambiguous-namespace.patch [email protected] -- Fixed Et -> Kin::Et to avoid ambiguous namespace; patch taken from upstream commit -Patch1: Rivet-fix-ambiguous-namespace.patch -BuildRequires: HepMC2-devel -BuildRequires: YODA-devel >= 1.7.4 +# PATCH-FIX-UPSTREAM Rivet-plugins-use-HepMC3.patch [email protected] -- Port an analysis plugin to HepMC3 from HepMC2 +Patch1: Rivet-plugins-use-HepMC3.patch +BuildRequires: HepMC-devel >= 3.0 +BuildRequires: YODA-devel >= 1.8.0 BuildRequires: doxygen +BuildRequires: fastjet-contrib-devel BuildRequires: fastjet-devel BuildRequires: fastjet-plugin-siscone-devel BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libboost_headers-devel BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: python-devel +BuildRequires: python3-Cython +BuildRequires: python3-devel +BuildRequires: rsync BuildRequires: texlive-latex-bin BuildRequires: yaml-cpp-devel BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(zlib) -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif %description The Rivet project (Robust Independent Validation of Experiment and @@ -78,6 +77,7 @@ Summary: A toolkit for validation of Monte Carlo event generators Group: Development/Libraries/C and C++ Requires: %{so_name} = %{version} +Requires: YODA-devel >= 1.8.0 %description devel The Rivet project (Robust Independent Validation of Experiment and @@ -91,11 +91,13 @@ This package provides the source files for development with %{name}. -%package -n python-%{name} +%package -n python3-%{name} Summary: A toolkit for validation of Monte Carlo event generators Group: Productivity/Scientific/Physics +Provides: python-%{name} +Obsoletes: python-%{name} -%description -n python-%{name} +%description -n python3-%{name} The Rivet project (Robust Independent Validation of Experiment and Theory) is a toolkit for validation of Monte Carlo event generators. It provides a large (and ever growing) set of experimental analyses @@ -125,9 +127,7 @@ This package provides all the analysis plugins for %{name}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 # REMOVE EXISTING rivet.pc FILE, ALLOW make TO GENERATE rivet.pc FROM rivet.pc.in rm -f rivet.pc @@ -138,7 +138,12 @@ %build autoreconf -fvi -%configure --docdir=%{_docdir}/%{name}/ +export PYTHON_VERSION=%{py3_ver} +%configure --with-hepmc3 \ + --with-hepmc3-libname=HepMC3 \ + --with-hepmc3-libpath=%{_libdir}/ \ + --with-hepmc3-incpath=%{_includedir}/ \ + --docdir=%{_docdir}/%{name}/ make %{?_smp_mflags} %install @@ -150,21 +155,18 @@ # /SECTION # SECTION Remove rpaths from config binaries and pkgconfig file -sed -i "s|-Wl,-rpath,||g" %{buildroot}%{_libdir}/pkgconfig/rivet.pc sed -i "s|-Wl,-rpath,||g" %{buildroot}%{_bindir}/rivet-config # /SECTION find %{buildroot} -type f -name "*.la" -delete -print -# SECTION Move .so plugins to %%{_libdir}/%%{name} -mkdir -p %{buildroot}%{_libdir}/%{name}-plugins -mv %{buildroot}%{_libdir}/Rivet*Analyses.so %{buildroot}%{_libdir}/%{name}-plugins/ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/%{name}-plugins" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-plugins.conf -# /SECTION +echo "%{_libdir}/%{name}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-plugins.conf -chmod -x %{buildroot}%{_datadir}/Rivet/ALICE_2012_I1126966.info %{buildroot}%{_datadir}/Rivet/ALICE_2014_I1243865.info -sed -E -i '1{/^#!.*env python/d}' %{buildroot}%{python_sitearch}/rivet/spiresbib.py +chmod -x %{buildroot}%{_datadir}/Rivet/ALICE_2012_I1126966.info \ + %{buildroot}%{_datadir}/Rivet/ALICE_2014_I1243865.info \ + %{buildroot}%{_datadir}/Rivet/STAR_2017_I1510593.{info,plot} +sed -E -i '1{/^#!.*env python/d}' %{buildroot}%{python3_sitearch}/rivet/spiresbib.py %fdupes %{buildroot}%{_datadir}/Rivet/ @@ -184,15 +186,15 @@ %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/rivet.pc -%files -n python-%{name} +%files -n python3-%{name} %{_bindir}/* %exclude %{_bindir}/rivet-config %exclude %{_bindir}/rivet-buildplugin -%{python_sitearch}/rivet/ -%{python_sitearch}/rivet-*egg-info +%{python3_sitearch}/rivet/ +%{python3_sitearch}/rivet-*egg-info %files plugins %config %{_sysconfdir}/ld.so.conf.d/%{name}-plugins.conf -%{_libdir}/%{name}-plugins/ +%{_libdir}/%{name}/ %changelog ++++++ Rivet-plugins-use-HepMC3.patch ++++++ Index: Rivet-3.1.0/analyses/pluginRHIC/STAR_2017_I1510593.cc =================================================================== --- Rivet-3.1.0.orig/analyses/pluginRHIC/STAR_2017_I1510593.cc +++ Rivet-3.1.0/analyses/pluginRHIC/STAR_2017_I1510593.cc @@ -188,8 +188,8 @@ void init() { const double c = cent(); /// Determine the impact parameter - const HepMC::HeavyIon* hi = event.genEvent()->heavy_ion(); - const double Npart = hi->Npart_targ(); + HepMC3::ConstGenHeavyIonPtr hi = event.genEvent()->heavy_ion(); + const double Npart = hi->Npart_targ; /// Determine the centrality bin if (c < 5) ++++++ sover.diff ++++++ --- /var/tmp/diff_new_pack.GyKvhf/_old 2020-01-17 16:04:18.028409201 +0100 +++ /var/tmp/diff_new_pack.GyKvhf/_new 2020-01-17 16:04:18.028409201 +0100 @@ -1,13 +1,13 @@ -Index: Rivet-2.7.2/src/Makefile.am +Index: Rivet-3.1.0/src/Makefile.am =================================================================== ---- Rivet-2.7.2.orig/src/Makefile.am -+++ Rivet-2.7.2/src/Makefile.am +--- Rivet-3.1.0.orig/src/Makefile.am ++++ Rivet-3.1.0/src/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libRivet.la libRivet_la_SOURCES = --libRivet_la_LDFLAGS = -export-dynamic -avoid-version -L$(YODALIBPATH) -L$(HEPMCLIBPATH) -+libRivet_la_LDFLAGS = -export-dynamic -release ${PACKAGE_VERSION} -L$(YODALIBPATH) -L$(HEPMCLIBPATH) +-libRivet_la_LDFLAGS = -export-dynamic -avoid-version -L$(YODALIBPATH) ++libRivet_la_LDFLAGS = -export-dynamic -release ${PACKAGE_VERSION} -L$(YODALIBPATH) libRivet_la_LIBADD = \ Core/libRivetCore.la \
