Hello community, here is the log from the commit of package SHERPA-MC for openSUSE:Factory checked in at 2020-06-03 20:31:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old) and /work/SRC/openSUSE:Factory/.SHERPA-MC.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SHERPA-MC" Wed Jun 3 20:31:43 2020 rev:15 rq:811083 version:2.2.10 Changes: -------- --- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes 2020-01-17 16:03:58.296399867 +0100 +++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.3606/SHERPA-MC.changes 2020-06-03 20:32:33.165179121 +0200 @@ -1,0 +2,29 @@ +Wed Jun 3 10:30:10 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Drop post(un) install-info scripts for devel pkg, these are + handled by rpm file triggers; also drop the appropriate + dependencies. + +------------------------------------------------------------------- +Sat May 16 01:26:01 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 2.2.10: + * Further improvements for Rivet3 and HepMC3 compatibility + [!321, !314]. + * Bugfix for crashes with new heavy-flavour shower evolution + schemes [!313]. + * Bugfix for crash in ReweightWithoutSubevents [!318]. + * Bugfix for documentation signal blob with pre-NLO+PS + kinematics [!320]. + * Bugfix for crash in setups with neutron beams [!312]. + * More robust discovery of HZTool and HepMC3 ROOT IO libraries + [!317, !322, !323]. +- Changes from version 2.2.9: See + https://gitlab.com/sherpa-team/sherpa/-/tags/v2.2.9. +- Build with Rivet support (BuildRequires: Rivet-devel). +- Fix some incorrect Provides and Obsoletes in subpackages. +- Execute hashbang cleanup on source files instead of acting on + installed files in %{buildroot}. +- Run spec-cleaner for minor formatting cleanups. + +------------------------------------------------------------------- Old: ---- SHERPA-MC-2.2.8.tar.gz New: ---- SHERPA-MC-2.2.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SHERPA-MC.spec ++++++ --- /var/tmp/diff_new_pack.fvffAS/_old 2020-06-03 20:32:35.121185067 +0200 +++ /var/tmp/diff_new_pack.fvffAS/_new 2020-06-03 20:32:35.121185067 +0200 @@ -20,17 +20,19 @@ %define _lto_cflags %{nil} Name: SHERPA-MC -Version: 2.2.8 +Version: 2.2.10 Release: 0 Summary: MC event generator for Simulation of High-Energy Reactions of PArticles License: GPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ -URL: https://sherpa.hepforge.org/ +URL: https://sherpa-team.gitlab.io/ Source: https://www.hepforge.org/downloads/sherpa/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch badshah...@gmail.com -- Fix a non-void (bool) function that was not returning any data to return "true" Patch0: SHERPA-MC-no-return-in-non-void-function.patch BuildRequires: HepMC-devel >= 3.0 BuildRequires: LHAPDF-devel +BuildRequires: Rivet-devel +BuildRequires: fastjet-contrib-devel BuildRequires: fastjet-devel BuildRequires: fastjet-plugin-siscone-devel BuildRequires: fdupes @@ -45,8 +47,6 @@ BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(yaml-cpp) BuildRequires: pkgconfig(zlib) -Requires(post): info -Requires(preun): info %description Sherpa is a Monte Carlo event generator for the Simulation of @@ -69,14 +69,14 @@ - in particular, for hadronic interactions as studied at the Fermilab Tevatron or the CERN LHC. -%package -n %soname +%package -n %{soname} Summary: MC event generator for Simulation of High-Energy Reactions of PArticles Group: System/Libraries -Obsoletes: libSHERPA-MC < %version-%release -Provides: libSHERPA-MC = %version-%release Requires: libSHERPA-MC-config +Obsoletes: libSHERPA-MC < %{version}-%{release} +Provides: libSHERPA-MC = %{version}-%{release} -%description -n %soname +%description -n %{soname} Sherpa is a Monte Carlo event generator for the Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions. It provides @@ -90,9 +90,9 @@ %package -n %{soname}-config Summary: Dynamic linker configuration for the SHERPA-MC libraries Group: System/Base +Provides: libSHERPA-MC-config = %{version} +Obsoletes: libSHERPA-MC-config < %{version} BuildArch: noarch -Provides: libSHERPA-MC-config < %{version}-release -Obsoletes: libSHERPA-MC-config = %{version}-release %description -n %{soname}-config Contains the ld.so.conf.d file for the SHERPA-MC libraries. @@ -100,7 +100,7 @@ %package devel Summary: MC event generator for Simulation of High-Energy Reactions of PArticles Group: Development/Libraries/C and C++ -Requires: %soname = %{version} +Requires: %{soname} = %{version} %description devel Sherpa is a Monte Carlo event generator for the Simulation of @@ -117,8 +117,8 @@ %package -n python3-%{name} Summary: Python extensions for SHERPA-MC Group: Development/Languages/Python -Provides: python-%{name} -Obsoletes: python-%{name} +Provides: python-%{name} = %{version} +Obsoletes: python-%{name} < %{version} %description -n python3-%{name} Sherpa is a Monte Carlo event generator for the Simulation of @@ -135,6 +135,12 @@ %setup -q %patch0 -p1 +# REMOVE HASHBANGS FROM FILES NOT TO BE INSTALLED TO EXEC PATH +sed -E -i "1{s|#!/bin/env python2||}" MODEL/UFO/test.py +sed -E -i "1{s|#!/usr/bin/python2||}" Examples/API/Events/test.py.in +sed -E -i "1{s|#!/usr/bin/python2||}" Examples/API/MPIEvents/test.py.in +sed -E -i "1{s|#!/usr/bin/env python2||}" Examples/API/ME2-Python/test.py.in + %build export PYTHON=python3 export PYTHON_VERSION=%{py3_ver} @@ -149,12 +155,10 @@ --enable-hepmc3=%{_prefix} \ --enable-fastjet=%{_prefix} \ --enable-lhapdf=%{_prefix} \ + --enable-rivet=%{_prefix} \ --enable-pythia=%{_prefix} -# FIXME: DOES NOT COMPILE AGAINST Rivet 3 -# --enable-rivet=%%{_prefix} \ - -make %{?_smp_mflags} +%make_build %install %make_install @@ -162,32 +166,18 @@ mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d echo %{_libdir}/%{name} > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{soname}.conf -find %{buildroot}%{_libdir}/%{name}/ -name *.la -delete - -# REMOVE HASHBANGS FROM FILES NOT IN EXEC PATH -sed -E -i "1{s|#!\s?/bin/env python2||}" %{buildroot}%{python3_sitelib}/ufo_interface/test.py -sed -E -i "1{s|#!\s?/usr/bin/python2||}" %{buildroot}%{_datadir}/%{name}/Examples/API/Events/test.py.in -sed -E -i "1{s|#!\s?/usr/bin/python2||}" %{buildroot}%{_datadir}/%{name}/Examples/API/MPIEvents/test.py.in -sed -E -i "1{s|#!\s?/usr/bin/env python2||}" %{buildroot}%{_datadir}/%{name}/Examples/API/ME2-Python/test.py.in +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}%{_datadir}/%{name}/ %fdupes %{buildroot}%{python3_sitelib}/ -%post -n %soname -p /sbin/ldconfig - -%post devel -%install_info --info-dir=%{_infodir} %{_infodir}/Sherpa.*.gz - -%postun -n %soname -p /sbin/ldconfig +%post -n %{soname} -p /sbin/ldconfig -%preun devel -%install_info_delete --info-dir=%{_infodir} %{_infodir}/Sherpa.*.gz +%postun -n %{soname} -p /sbin/ldconfig -%files -n %soname -# Even though the dir itself isn't versioned, the shared libs inside it are, so this works -%dir %{_libdir}/%{name}/ +%files -n %{soname} +%dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so.* -# %files -n %{soname}-config %config %{_sysconfdir}/ld.so.conf.d/%{soname}.conf ++++++ SHERPA-MC-2.2.8.tar.gz -> SHERPA-MC-2.2.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC-2.2.8.tar.gz /work/SRC/openSUSE:Factory/.SHERPA-MC.new.3606/SHERPA-MC-2.2.10.tar.gz differ: char 13, line 1 ++++++ SHERPA-MC-no-return-in-non-void-function.patch ++++++ --- /var/tmp/diff_new_pack.fvffAS/_old 2020-06-03 20:32:35.173185225 +0200 +++ /var/tmp/diff_new_pack.fvffAS/_new 2020-06-03 20:32:35.173185225 +0200 @@ -1,8 +1,8 @@ -Index: SHERPA-MC-2.2.6/SHERPA/Tools/Variations.C +Index: SHERPA-MC-2.2.10/SHERPA/Tools/Variations.C =================================================================== ---- SHERPA-MC-2.2.6.orig/SHERPA/Tools/Variations.C -+++ SHERPA-MC-2.2.6/SHERPA/Tools/Variations.C -@@ -632,6 +632,7 @@ namespace SHERPA { +--- SHERPA-MC-2.2.10.orig/SHERPA/Tools/Variations.C ++++ SHERPA-MC-2.2.10/SHERPA/Tools/Variations.C +@@ -641,6 +641,7 @@ namespace SHERPA { case Variations_Type::sudakov: return s << "Sudakov"; } @@ -10,10 +10,10 @@ } std::ostream& operator<<(std::ostream& s, const Variation_Weights& weights) -Index: SHERPA-MC-2.2.6/MODEL/Main/Color_Function.C +Index: SHERPA-MC-2.2.10/MODEL/Main/Color_Function.C =================================================================== ---- SHERPA-MC-2.2.6.orig/MODEL/Main/Color_Function.C -+++ SHERPA-MC-2.2.6/MODEL/Main/Color_Function.C +--- SHERPA-MC-2.2.10.orig/MODEL/Main/Color_Function.C ++++ SHERPA-MC-2.2.10/MODEL/Main/Color_Function.C @@ -63,6 +63,7 @@ std::string Color_Function::String() con case cf::None: case cf::Unknown: return "1";
