Hello community, here is the log from the commit of package Herwig for openSUSE:Factory checked in at 2020-06-12 21:41:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Herwig (Old) and /work/SRC/openSUSE:Factory/.Herwig.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Herwig" Fri Jun 12 21:41:52 2020 rev:13 rq:814031 version:7.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/Herwig/Herwig.changes 2020-01-11 14:43:28.005266123 +0100 +++ /work/SRC/openSUSE:Factory/.Herwig.new.3606/Herwig.changes 2020-06-12 21:43:49.516396885 +0200 @@ -1,0 +2,12 @@ +Mon Jun 8 00:47:33 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Update to version 7.2.1: + * Vertex position fix for taus in dipole shower events. +- Add Herwig-type-mismatch-fix.patch to fix data of incorrect type + sent to functions, flagged by GCC 10. +- Use autosetup instead of individual patch commands. +- Use %make_build which automatically uses parallel threads and + makes the compilation more verbose. +- Remove a spurious .orig file. + +------------------------------------------------------------------- Old: ---- Herwig-7.2.0.tar.bz2 New: ---- Herwig-7.2.1.tar.bz2 Herwig-type-mismatch-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Herwig.spec ++++++ --- /var/tmp/diff_new_pack.V47jGH/_old 2020-06-12 21:43:51.764402534 +0200 +++ /var/tmp/diff_new_pack.V47jGH/_new 2020-06-12 21:43:51.764402534 +0200 @@ -19,7 +19,7 @@ %define _lto_cflags %{nil} %define so_name Herwig-libs Name: Herwig -Version: 7.2.0 +Version: 7.2.1 Release: 0 Summary: Multi-purpose event generator for high-energy physics License: GPL-2.0-only @@ -29,6 +29,8 @@ Source1: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE Herwig-disable-repo-install.patch [email protected] -- Disable post-install hooks intended to set up the Herwig repo, this doesn't work inside the build script because of missing LHAPDF data that needs to be installed by the user; the install-hook doesn't serve any purpose while building the rpm and users can easily set this up on their own Patch0: Herwig-disable-repo-install.patch +# PATCH-FIX-UPSTREAM Herwig-type-mismatch-fix.patch [email protected] -- Fix a type mismatch error in fortran flagged by GCC 10 +Patch1: Herwig-type-mismatch-fix.patch BuildRequires: HepMC2-devel BuildRequires: LHAPDF-devel BuildRequires: Rivet-devel @@ -105,11 +107,11 @@ with %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 -# REMOVE A SPURIOUS BACKUP FILE +# REMOVE SPURIOUS BACKUP FILES rm Models/Feynrules/python/ufo2peg/converter.py.rej~ +rm Models/Feynrules/python/ufo2peg/vertices.py.orig # FIX ENV BASED HASHBANG sed -i "1{s|/usr/bin/env bash|/bin/bash|}" src/herwig-config.in @@ -117,7 +119,7 @@ %build autoreconf -fvi %configure --disable-static -make %{?_smp_mflags} +%make_build %install %make_install ++++++ Herwig-7.2.0.tar.bz2 -> Herwig-7.2.1.tar.bz2 ++++++ ++++ 143756 lines of diff (skipped) ++++++ Herwig-disable-repo-install.patch ++++++ --- /var/tmp/diff_new_pack.V47jGH/_old 2020-06-12 21:43:54.988410637 +0200 +++ /var/tmp/diff_new_pack.V47jGH/_new 2020-06-12 21:43:54.988410637 +0200 @@ -1,8 +1,8 @@ -Index: Herwig-7.1.1/src/Makefile.am +Index: Herwig-7.2.1/src/Makefile.am =================================================================== ---- Herwig-7.1.1.orig/src/Makefile.am -+++ Herwig-7.1.1/src/Makefile.am -@@ -174,11 +174,6 @@ THEPEGREPO=$(THEPEGLIBPATH)/ThePEGDefaul +--- Herwig-7.2.1.orig/src/Makefile.am ++++ Herwig-7.2.1/src/Makefile.am +@@ -177,11 +177,6 @@ THEPEGREPO=$(THEPEGLIBPATH)/ThePEGDefaul install-data-hook: @echo Creating repository ++++++ Herwig-type-mismatch-fix.patch ++++++ Index: Herwig-7.2.1/Looptools/D/D0func.F =================================================================== --- Herwig-7.2.1.orig/Looptools/D/D0func.F +++ Herwig-7.2.1/Looptools/D/D0func.F @@ -1209,10 +1209,11 @@ & Li2omrat2(q4, s, m3, m4) + & Li2omrat2(q4, s, -1D0, -1D0) else if( case .eq. 2 ) then - dilogs = Li2omrat2(q3, t, x43(4), x43(2)) + - & Li2omrat2(q3, t, x43(3), x43(1)) + - & Li2omrat2(q4, s, x43(1), x43(3)) + - & Li2omrat2(q4, s, x43(2), x43(4)) +* case=2 implies the imaginary part of d, and therefore x43(*), is zeroeps + dilogs = Li2omrat2(q3, t, REAL(x43(4)), REAL(x43(2))) + + & Li2omrat2(q3, t, REAL(x43(3)), REAL(x43(1))) + + & Li2omrat2(q4, s, REAL(x43(1)), REAL(x43(3))) + + & Li2omrat2(q4, s, REAL(x43(2)), REAL(x43(4))) else r3t = q3/t s3t = sign(.5D0, q3) - sign(.5D0, t) @@ -1244,8 +1245,9 @@ dilogs = Li2omrat2(q4, s, m3, m4) + & Li2omrat2(q4, s, -1D0, -1D0) else if( case .eq. 2 ) then - dilogs = Li2omrat2(q4, s, x43(1), x43(3)) + - & Li2omrat2(q4, s, x43(2), x43(4)) +* case=2 implies the imaginary part of d, and therefore x43(*), is zeroeps + dilogs = Li2omrat2(q4, s, REAL(x43(1)), REAL(x43(3))) + + & Li2omrat2(q4, s, REAL(x43(2)), REAL(x43(4))) else r4s = q4/s s4s = sign(.5D0, q4) - sign(.5D0, s) Index: Herwig-7.2.1/Looptools/D/D0funcC.F =================================================================== --- Herwig-7.2.1.orig/Looptools/D/D0funcC.F +++ Herwig-7.2.1/Looptools/D/D0funcC.F @@ -948,7 +948,7 @@ c PRINT '(8F14.2)', Mc(1), Mc(2), Mc(3), if( case .eq. 1 ) then dilogs = cLi2omrat2(q4, s, m3, m4) + - & cLi2omrat2(q4, s, -1D0, -1D0) + & cLi2omrat2(q4, s, DCMPLX(-1D0), DCMPLX(-1D0)) else if( case .eq. 2 ) then dilogs = cLi2omrat2(q4, s, x43(1), x43(3)) + & cLi2omrat2(q4, s, x43(2), x43(4))
