Hello community,
here is the log from the commit of package SHERPA-MC for openSUSE:Factory checked in at 2019-02-11 21:25:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old)
and /work/SRC/openSUSE:Factory/.SHERPA-MC.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SHERPA-MC"
Mon Feb 11 21:25:49 2019 rev:10 rq:673053 version:2.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes 2018-04-27 16:08:42.595638438 +0200
+++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new.28833/SHERPA-MC.changes 2019-02-11 21:25:55.143063328 +0100
@@ -1,0 +2,55 @@
+Tue Feb 5 13:16:04 UTC 2019 - Atri Bhattacharya
+
+- Refresh source tarball: updated by upstream without version
+ change or listing changes.
+- Use %%license to install COPYING file.
+- Minor specfile cleanups.
+
+-------------------------------------------------------------------
+Thu Jan 24 15:38:24 UTC 2019 - badshah400@gmail.com
+
+- Update to version 2.2.6:
+ * Add initial-state p_z and inelasticity selectors for DIS (#80)
+ * Improve the reweighting to include the local K=BBar/B factor
+ in MEPS@NLO runs (#73)
+ * Improve treatment of the shower reweighting scale cut-off, it
+ is now applied also when reweighting AlphaS and the PDFs in
+ the CKKW clustering sequence (also mentioned in #73)
+ * Adapt status=4 convention in the short HepMC output (#79)
+ * Compute approximate NLO EW corrections (and subleading orders)
+ as on-the-fly alternative event weights (#41). See Example in
+ Manual for details. Currently only works with a
+ soon-to-be-released version of OpenLoops.
+ * Add a filter between the perturbative and the non-perturbative
+ event phase, which can be used to reject events with
+ parton-level cuts (!94)
+ * Bug fixes:
+ - Fix NLO and Variable Selector routines (#70, #88)
+ - Fix unweighting treatment for the LocalKFactor (and its
+ on-the-fly variations) in negative events (#94)
+ - Fix argument validation in
+ GGH_KFactor_Setter::ClusterMassCorrectionFactor
+ - Fix core scale setter for DIS when the incoming particles
+ are ordered ep instead of pe and adapt it for ee->xy (where
+ xy is not a quark pair) (!81)
+ - Fix strong coupling reweighting in merging runs in cases
+ where nothing was clustered (#66)
+ - Fix beam remnants for DIS setups
+ - Fix rejection of rare negative-energy configurations in the
+ shower (#44)
+ - Fix treatment of negative UserHook weights in HepMC
+ interface (#100)
+ - Fix a mapping in the OpenLoops parameter-setting interface
+ (#87)
+ - Fix HEFT Higgs production with COMIX (#114)
+ - Fix compatibility issues with recent versions of Rivet
+ - Fix error when compiling with MCFM support
+ - Fix compilation on ARM/PowerPC architectures
+ - Make environment importing when building scons scripts more
+ bullet-proof
+ - Fix compilation of the HZTool interface add-on
+- Drop SHERPA-MC-fix_arm_build.patch: fixed upstream.
+- Rebase SHERPA-MC-no-return-in-non-void-function.patch: partially
+ upstreamed; fix new error introduced.
+
+-------------------------------------------------------------------
Old:
----
SHERPA-MC-2.2.5.tar.gz
SHERPA-MC-fix_arm_build.patch
New:
----
SHERPA-MC-2.2.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ SHERPA-MC.spec ++++++
--- /var/tmp/diff_new_pack.oJGxj3/_old 2019-02-11 21:25:55.835062955 +0100
+++ /var/tmp/diff_new_pack.oJGxj3/_new 2019-02-11 21:25:55.839062952 +0100
@@ -1,7 +1,7 @@
#
# spec file for package SHERPA-MC
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define soname lib%{name}0
Name: SHERPA-MC
-Version: 2.2.5
+Version: 2.2.6
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
@@ -28,8 +28,6 @@
Source: http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch badshah400@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
-# PATCH-FIX-UPSTREAM SHERPA-MC-fix_arm_build.patch guillaume@opensuse.org -- char are not signed on ARM, so explicitly declare them signed
-Patch1: SHERPA-MC-fix_arm_build.patch
BuildRequires: HepMC2-devel
BuildRequires: LHAPDF-devel
BuildRequires: Rivet-devel
@@ -139,7 +137,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p0
%build
%configure \
@@ -180,19 +177,17 @@
%install_info_delete --info-dir=%{_infodir} %{_infodir}/Sherpa.*.gz
%files -n %soname
-%defattr(-,root,root)
# Even though the dir itself isn't versioned, the shared libs inside it are, so this works
%dir %{_libdir}/%{name}/
%{_libdir}/%{name}/*.so.*
#
%files -n %{soname}-config
-%defattr(-,root,root)
%config %{_sysconfdir}/ld.so.conf.d/%{soname}.conf
%files devel
-%defattr(-,root,root)
-%doc ChangeLog README COPYING
+%license COPYING
+%doc ChangeLog README
%{_bindir}/get_bibtex
%{_bindir}/Combine_Analysis
%{_bindir}/Sherpa
@@ -211,7 +206,6 @@
%{_infodir}/Sherpa.*.gz
%files -n python-%{name}
-%defattr(-,root,root)
%{python_sitelib}/Sherpa.py*
%{python_sitelib}/_Sherpa.*
++++++ SHERPA-MC-2.2.5.tar.gz -> SHERPA-MC-2.2.6.tar.gz ++++++
/work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC-2.2.5.tar.gz /work/SRC/openSUSE:Factory/.SHERPA-MC.new.28833/SHERPA-MC-2.2.6.tar.gz differ: char 5, line 1
++++++ SHERPA-MC-no-return-in-non-void-function.patch ++++++
--- /var/tmp/diff_new_pack.oJGxj3/_old 2019-02-11 21:25:55.879062931 +0100
+++ /var/tmp/diff_new_pack.oJGxj3/_new 2019-02-11 21:25:55.883062928 +0100
@@ -1,20 +1,8 @@
-Index: SHERPA-MC-2.2.4/MCATNLO/Showers/Splitting_Function_Base.C
+Index: SHERPA-MC-2.2.6/SHERPA/Tools/Variations.C
===================================================================
---- SHERPA-MC-2.2.4.orig/MCATNLO/Showers/Splitting_Function_Base.C
-+++ SHERPA-MC-2.2.4/MCATNLO/Showers/Splitting_Function_Base.C
-@@ -268,6 +268,7 @@ Parton *Splitting_Function_Base::SelectS
- double disc=ran->Get()*m_lastints.back(), sum(0.0);
- for (size_t i(0);i=disc) return SetSpec(m_specs[i]);
-+ return NULL;
- }
-
- void Splitting_Function_Base::ClearSpecs()
-diff --git SHERPA-MC-2.2.5.orig/SHERPA/Tools/Variations.C SHERPA-MC-2.2.5/SHERPA/Tools/Variations.C
-index 3924ca5..276f9bc 100644
---- SHERPA-MC-2.2.5.orig/SHERPA/Tools/Variations.C
-+++ SHERPA-MC-2.2.5/SHERPA/Tools/Variations.C
-@@ -564,6 +564,7 @@ namespace SHERPA {
+--- 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 {
case Variations_Type::sudakov:
return s << "Sudakov";
}
@@ -22,3 +10,15 @@
}
std::ostream& operator<<(std::ostream& s, const Variation_Weights& weights)
+Index: SHERPA-MC-2.2.6/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
+@@ -63,6 +63,7 @@ std::string Color_Function::String() con
+ case cf::None:
+ case cf::Unknown: return "1";
+ }
++ return "0";
+ }
+
+ Color_Function::~Color_Function() {