Hello community, here is the log from the commit of package Herwig++ for openSUSE:Factory checked in at 2014-08-25 11:03:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Herwig++ (Old) and /work/SRC/openSUSE:Factory/.Herwig++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Herwig++" Changes: -------- --- /work/SRC/openSUSE:Factory/Herwig++/Herwig++.changes 2014-06-30 21:50:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Herwig++.new/Herwig++.changes 2014-08-25 11:04:46.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Aug 21 11:58:19 UTC 2014 - [email protected] + +- Update Herwig++-fix-hepanalysis-check.patch to not depend on x86 +- Remove x86 dependency on ThePEG check. Fixes build on other 64bit + platforms like s390x, ppc64 and aarch64 + (Herwig++-ThePEG-lib64.patch) + +------------------------------------------------------------------- New: ---- Herwig++-ThePEG-lib64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Herwig++.spec ++++++ --- /var/tmp/diff_new_pack.PxtuD6/_old 2014-08-25 11:04:47.000000000 +0200 +++ /var/tmp/diff_new_pack.PxtuD6/_new 2014-08-25 11:04:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Herwig++ # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source: http://www.hepforge.org/archive/herwig/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM Herwig++-fix-hepanalysis-check.patch [email protected] -- Fix location for checking for HepAnalysis.so for x86_64 arch Patch0: Herwig++-fix-hepanalysis-check.patch +Patch1: Herwig++-ThePEG-lib64.patch BuildRequires: HepMC-devel BuildRequires: LHAPDF-devel BuildRequires: Rivet-devel @@ -93,6 +94,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -i ++++++ Herwig++-ThePEG-lib64.patch ++++++ Index: Herwig++-2.7.0/m4/herwig.m4 =================================================================== --- Herwig++-2.7.0.orig/m4/herwig.m4 +++ Herwig++-2.7.0/m4/herwig.m4 @@ -69,7 +69,7 @@ THEPEGHASLHAPDF="no" if test -e ${with_thepeg}/lib/ThePEG/ThePEGLHAPDF.so ; then THEPEGHASLHAPDF="yes" fi -if test "${host_cpu}" == "x86_64" -a -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then +if test -e ${with_thepeg}/lib64/ThePEG/libThePEG.so ; then THEPEGLDFLAGS="-L${with_thepeg}/lib64/ThePEG" if test -e ${with_thepeg}/lib64/ThePEG/ThePEGLHAPDF.so ; then THEPEGHASLHAPDF="yes" ++++++ Herwig++-fix-hepanalysis-check.patch ++++++ --- /var/tmp/diff_new_pack.PxtuD6/_old 2014-08-25 11:04:47.000000000 +0200 +++ /var/tmp/diff_new_pack.PxtuD6/_new 2014-08-25 11:04:47.000000000 +0200 @@ -1,12 +1,10 @@ Index: Herwig++-2.7.0/m4/herwig.m4 =================================================================== ---- Herwig++-2.7.0.orig/m4/herwig.m4 -+++ Herwig++-2.7.0/m4/herwig.m4 @@ -119,6 +119,9 @@ AC_MSG_CHECKING([for HepMCAnalysis.so in if test -e "$THEPEGPATH/lib/ThePEG/HepMCAnalysis.so" ; then CREATE_HEPMC="create" AC_MSG_RESULT([found]) -+elif test "${host_cpu}" == "x86_64" -a -e "$THEPEGPATH/lib64/ThePEG/HepMCAnalysis.so" ; then ++elif test -e "$THEPEGPATH/lib64/ThePEG/HepMCAnalysis.so" ; then + CREATE_HEPMC="create" + AC_MSG_RESULT([found]) else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
