Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package SHERPA-MC for openSUSE:Factory checked in at 2022-06-28 15:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old) and /work/SRC/openSUSE:Factory/.SHERPA-MC.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SHERPA-MC" Tue Jun 28 15:21:44 2022 rev:19 rq:985304 version:2.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes 2021-12-12 00:58:09.654607094 +0100 +++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.1548/SHERPA-MC.changes 2022-06-28 15:21:56.253903452 +0200 @@ -1,0 +2,7 @@ +Wed Jun 22 23:11:34 UTC 2022 - Atri Bhattacharya <[email protected]> + +- Add SHERPA-MC-ignore-distutils-deprecation-warning.patch: + Disable deprecation warning when importing distutils from + python3.10, so that autotools checks can still work. + +------------------------------------------------------------------- New: ---- SHERPA-MC-ignore-distutils-deprecation-warning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SHERPA-MC.spec ++++++ --- /var/tmp/diff_new_pack.7rnY8j/_old 2022-06-28 15:21:56.769904221 +0200 +++ /var/tmp/diff_new_pack.7rnY8j/_new 2022-06-28 15:21:56.769904221 +0200 @@ -1,7 +1,7 @@ # # spec file for package SHERPA-MC # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ Source: https://www.hepforge.org/downloads/sherpa/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch [email protected] -- 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 +# PATCH-FIX-UPSTREAM SHERPA-MC-ignore-distutils-deprecation-warning.patch [email protected] -- Disable deprecation warning when importing distutils from python3.10, so that autotools can still work +Patch1: SHERPA-MC-ignore-distutils-deprecation-warning.patch BuildRequires: HepMC-devel >= 3.0 BuildRequires: LHAPDF-devel BuildRequires: Rivet-devel @@ -144,6 +146,7 @@ %build export PYTHON=python3 export PYTHON_VERSION=%{py3_ver} +autoreconf -fvi %configure \ --docdir=%{_docdir}/%{name} \ --enable-ufo \ ++++++ SHERPA-MC-ignore-distutils-deprecation-warning.patch ++++++ Index: SHERPA-MC-2.2.12/m4/ax_python_devel.m4 =================================================================== --- SHERPA-MC-2.2.12.orig/m4/ax_python_devel.m4 +++ SHERPA-MC-2.2.12/m4/ax_python_devel.m4 @@ -136,7 +136,7 @@ variable to configure. See ``configure - # Check if you have distutils, else fail # AC_MSG_CHECKING([for the distutils Python package]) - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + ac_distutils_result=`$PYTHON -c "import warnings; warnings.simplefilter('ignore'); import distutils" 2>&1` if test -z "$ac_distutils_result"; then AC_MSG_RESULT([yes]) else ++++++ SHERPA-MC-no-return-in-non-void-function.patch ++++++ --- /var/tmp/diff_new_pack.7rnY8j/_old 2022-06-28 15:21:56.801904269 +0200 +++ /var/tmp/diff_new_pack.7rnY8j/_new 2022-06-28 15:21:56.805904276 +0200 @@ -1,8 +1,8 @@ -Index: SHERPA-MC-2.2.10/SHERPA/Tools/Variations.C +Index: SHERPA-MC-2.2.12/SHERPA/Tools/Variations.C =================================================================== ---- 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 { +--- SHERPA-MC-2.2.12.orig/SHERPA/Tools/Variations.C ++++ SHERPA-MC-2.2.12/SHERPA/Tools/Variations.C +@@ -657,6 +657,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.10/MODEL/Main/Color_Function.C +Index: SHERPA-MC-2.2.12/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 +--- SHERPA-MC-2.2.12.orig/MODEL/Main/Color_Function.C ++++ SHERPA-MC-2.2.12/MODEL/Main/Color_Function.C @@ -63,6 +63,7 @@ std::string Color_Function::String() con case cf::None: case cf::Unknown: return "1";
