Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2017-08-24 18:44:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pythia (Old) and /work/SRC/openSUSE:Factory/.pythia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Thu Aug 24 18:44:00 2017 rev:17 rq:514116 version:8.226 Changes: -------- --- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2017-02-06 15:24:36.571172261 +0100 +++ /work/SRC/openSUSE:Factory/.pythia.new/pythia.changes 2017-08-24 18:44:24.392941689 +0200 @@ -1,0 +2,15 @@ +Mon Jul 31 16:21:15 UTC 2017 - [email protected] + +- Update to version 8.226: + + See list of changes at: + http://home.thep.lu.se/~torbjorn/pythia82html/UpdateHistory.html +- Rebase patches for update. +- Add python-dont-force-std-cxx98.patch to prevent usage of + --std=c++98 and instead inherit default compiler flags; using + c++98 causes conflicts with dependencies such as fastjet which + are built using default compiler std, leading to build failures + for openSUSE > 1320 (where fastjet is compiled with --std=c+=14 + support). Tests in the check section show that this does not + have any untoward repercussions. + +------------------------------------------------------------------- Old: ---- pythia8223.tgz New: ---- pythia8226.tgz python-dont-force-std-cxx98.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.tGbqYu/_old 2017-08-24 18:44:28.360383066 +0200 +++ /var/tmp/diff_new_pack.tGbqYu/_new 2017-08-24 18:44:28.364382503 +0200 @@ -16,11 +16,11 @@ # -%define ver 8223 +%define ver 8226 %define soname lib%{name}8 Name: pythia -Version: 8.223 +Version: 8.226 Release: 0 Summary: A simulation program for particle collisions at very high energies License: GPL-2.0 @@ -33,6 +33,8 @@ Patch1: pythia-honour-env-cxxflags.patch # PATCH-FIX-UPSTREAM pythia-remove-rpaths.patch [email protected] -- Delete rpath references when building libraries; patch sent upstream Patch2: pythia-remove-rpaths.patch +# PATCH-FIX-UPSTREAM python-dont-force-std-cxx98.patch [email protected] -- Dependencies such as fastjet already use std=c++14 where available, so forcing std=c++98 makes pythia incompatible when used with such system libraries +Patch3: python-dont-force-std-cxx98.patch BuildRequires: HepMC-devel BuildRequires: LHAPDF-devel %if 0%{?suse_version} > 1325 @@ -117,6 +119,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # REMOVE UNNEEDED .orig FILES FROM THE examples DIR rm -f examples/Makefile.orig ++++++ pythia-honour-env-cxxflags.patch ++++++ --- /var/tmp/diff_new_pack.tGbqYu/_old 2017-08-24 18:44:28.388379125 +0200 +++ /var/tmp/diff_new_pack.tGbqYu/_new 2017-08-24 18:44:28.392378562 +0200 @@ -1,20 +1,20 @@ -Index: pythia8219/configure +Index: pythia8226/configure =================================================================== ---- pythia8219.orig/configure -+++ pythia8219/configure +--- pythia8226.orig/configure ++++ pythia8226/configure @@ -209,7 +209,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! echo "WARNING: Unknown architecture $ARCH, set as LINUX."; ARCH="LINUX"; fi if [ -z "$CXX" ]; then CXX="g++"; fi if [ -z "$CXX_COMMON" ]; then -- CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}-ansi" -+ CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}-ansi ${CXXFLAGS}" +- CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}-std=c++98" ++ CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}${ENABLE_64BIT}-std=c++98" CXX_COMMON="$CXX_COMMON -pedantic -W -Wall -Wshadow -fPIC"; fi if [ -z "$CXX_SHARED" ]; then if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi -Index: pythia8219/bin/pythia8-config +Index: pythia8226/bin/pythia8-config =================================================================== ---- pythia8219.orig/bin/pythia8-config -+++ pythia8219/bin/pythia8-config +--- pythia8226.orig/bin/pythia8-config ++++ pythia8226/bin/pythia8-config @@ -70,8 +70,8 @@ elif [ ! -f $CFG_FILE ]; then while read LINE; do if [[ $LINE == \#\ --* ]]; then CONFIG+=${LINE#?}; fi ++++++ pythia-makefile-destdir-support.patch ++++++ --- /var/tmp/diff_new_pack.tGbqYu/_old 2017-08-24 18:44:28.404376872 +0200 +++ /var/tmp/diff_new_pack.tGbqYu/_new 2017-08-24 18:44:28.404376872 +0200 @@ -1,8 +1,8 @@ -Index: pythia8219/Makefile +Index: pythia8226/Makefile =================================================================== ---- pythia8219.orig/Makefile -+++ pythia8219/Makefile -@@ -142,12 +142,12 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD +--- pythia8226.orig/Makefile ++++ pythia8226/Makefile +@@ -143,12 +143,12 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD # Install (rsync is used for finer control). install: all ++++++ pythia-remove-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.tGbqYu/_old 2017-08-24 18:44:28.420374620 +0200 +++ /var/tmp/diff_new_pack.tGbqYu/_new 2017-08-24 18:44:28.420374620 +0200 @@ -1,8 +1,8 @@ -Index: pythia8219/Makefile +Index: pythia8226/Makefile =================================================================== ---- pythia8219.orig/Makefile -+++ pythia8219/Makefile -@@ -55,19 +55,30 @@ ifeq ($(POWHEG_USE),true) +--- pythia8226.orig/Makefile ++++ pythia8226/Makefile +@@ -58,19 +58,30 @@ ifeq ($(POWHEG_USE),true) endif # Python. @@ -37,49 +37,52 @@ endif ################################################################################ -@@ -109,12 +120,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN +@@ -112,12 +123,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN -I$(BOOST_INCLUDE) $(CXX_COMMON) $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\ $(LOCAL_LIB)/libpythia8.a +ifneq ($(DISABLE_RPATH),true) - $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME),$(notdir $@)\ + $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ -L$(LHAPDF5_LIB) -Wl,-rpath,$(LHAPDF5_LIB) -lLHAPDF -lgfortran +else -+ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME),$(notdir $@)\ ++ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ + -L$(LHAPDF5_LIB) -lLHAPDF -lgfortran +endif $(LOCAL_LIB)/libpythia8lhapdf6.so: $(LOCAL_TMP)/LHAPDF6Plugin.o\ $(LOCAL_LIB)/libpythia8.a +- $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ +- -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF +ifneq ($(DISABLE_RPATH),true) - $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME),$(notdir $@)\ - -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF ++ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ ++ -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF +else -+ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME),$(notdir $@)\ ++ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ + -L$(LHAPDF6_LIB) -lLHAPDF +endif # POWHEG (exclude any executable ending with sh). $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h -@@ -122,9 +143,15 @@ $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INC +@@ -125,9 +146,15 @@ $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INC $(LOCAL_LIB)/libpythia8powheg%sh.so: $(POWHEG_BIN)/%sh; $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)/% $(LOCAL_TMP)/POWHEGPlugin.o\ $(LOCAL_LIB)/libpythia8.a +ifneq ($(DISABLE_RPATH),true) ++ ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ ++ $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ ++ $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) ++else ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ - $(CXX_SONAME),$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) -+else -+ ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ -+ $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ -+ $(CXX_SONAME),$(notdir $@); rm $(notdir $<) +- $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) ++ $(CXX_SONAME)$(notdir $@); rm $(notdir $<) +endif # Python (turn off all warnings for readability). $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h -Index: pythia8219/configure +Index: pythia8226/configure =================================================================== ---- pythia8219.orig/configure -+++ pythia8219/configure +--- pythia8226.orig/configure ++++ pythia8226/configure @@ -31,6 +31,7 @@ Configuration options. --enable-debug : Turn on debugging and disable optimization. --enable-64bit : Turn on 64-bit compilation. @@ -105,7 +108,7 @@ if [ -z "$ARCH" ]; then ARCH=$(uname | grep -i -o -e Linux -e Darwin); fi ARCH=$(echo $ARCH | awk '{print toupper($0)}') if [ "$ARCH" != "LINUX" ] && [ "$ARCH" != "DARWIN" ]; then -@@ -289,6 +291,7 @@ echo "Configured for $ARCH with the foll +@@ -287,6 +289,7 @@ echo "Configured for $ARCH with the foll if [ "$ENABLE_DEBUG_SET" = true ]; then echo "--enable-debug"; fi if [ "$ENABLE_64BIT_SET" = true ]; then echo "--enable-64bit"; fi if [ "$ENABLE_SHARED_SET" = true ]; then echo "--enable-shared"; fi @@ -113,7 +116,7 @@ if [ "$LCG_SET" = true ]; then echo "--lcg=$LCG"; fi cat >> $CFG_FILE << BLOCKTEXT -@@ -300,6 +303,7 @@ PREFIX_SHARE=$PREFIX_SHARE +@@ -298,6 +301,7 @@ PREFIX_SHARE=$PREFIX_SHARE # Compilation flags (see ./configure --help for further documentation). ENABLE_SHARED=$ENABLE_SHARED @@ -121,11 +124,11 @@ CXX=$CXX CXX_COMMON=$CXX_COMMON CXX_SHARED=$CXX_SHARED -Index: pythia8219/examples/Makefile +Index: pythia8226/examples/Makefile =================================================================== ---- pythia8219.orig/examples/Makefile -+++ pythia8219/examples/Makefile -@@ -20,7 +20,10 @@ +--- pythia8226.orig/examples/Makefile ++++ pythia8226/examples/Makefile +@@ -23,7 +23,10 @@ SHELL=/usr/bin/env bash # Handle GZIP support. ifeq ($(GZIP_USE),true) CXX_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) @@ -137,15 +140,3 @@ endif # Check distribution (use local version first, then installed version). -@@ -28,7 +31,10 @@ ifneq ("$(wildcard ../lib/libpythia8.a)" - PREFIX_LIB=../lib - PREFIX_INCLUDE=../include - endif --CXX_COMMON:=-I$(PREFIX_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB) -ldl -+CXX_COMMON:=-I$(PREFIX_INCLUDE) $(CXX_COMMON) -ldl -+ifneq ($(DISABLE_RPATH),true) -+ CXX_COMMON+= -Wl,-rpath,$(PREFIX_LIB) -+endif - - ################################################################################ - # RULES: Definition of the rules used to build the PYTHIA examples. ++++++ pythia8223.tgz -> pythia8226.tgz ++++++ /work/SRC/openSUSE:Factory/pythia/pythia8223.tgz /work/SRC/openSUSE:Factory/.pythia.new/pythia8226.tgz differ: char 5, line 1 ++++++ python-dont-force-std-cxx98.patch ++++++ Index: pythia8226/configure =================================================================== --- pythia8226.orig/configure +++ pythia8226/configure @@ -211,7 +211,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! echo "WARNING: Unknown architecture $ARCH, set as LINUX."; ARCH="LINUX"; fi if [ -z "$CXX" ]; then CXX="g++"; fi if [ -z "$CXX_COMMON" ]; then - CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}${ENABLE_64BIT}-std=c++98" + CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}${ENABLE_64BIT}" CXX_COMMON="$CXX_COMMON -pedantic -W -Wall -Wshadow -fPIC"; fi if [ -z "$CXX_SHARED" ]; then if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi
