Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2024-03-18 16:45:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pythia (Old) and /work/SRC/openSUSE:Factory/.pythia.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Mon Mar 18 16:45:25 2024 rev:30 rq:1158846 version:8.311 Changes: -------- --- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2023-07-31 15:24:28.219359180 +0200 +++ /work/SRC/openSUSE:Factory/.pythia.new.1905/pythia.changes 2024-03-18 16:45:47.233677204 +0100 @@ -1,0 +2,12 @@ +Sun Mar 10 18:39:27 UTC 2024 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 8.311: + * Too many changes to list, see https://pythia.org/history/. +- Minor rebasing of patches to apply cleanly against update: + * pythia-examples-link-gmp.patch + * pythia-honour-env-cxxflags.patch + * pythia-remove-rpaths.patch + * reproducible.patch +- Make doc package noarch. + +------------------------------------------------------------------- Old: ---- pythia8310.tgz New: ---- pythia8311.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.J9XGmz/_old 2024-03-18 16:45:48.445721914 +0100 +++ /var/tmp/diff_new_pack.J9XGmz/_new 2024-03-18 16:45:48.445721914 +0100 @@ -1,7 +1,7 @@ # # spec file for package pythia # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%define ver 8310 +%define ver 8311 %define soname lib%{name}8 Name: pythia -Version: 8.310 +Version: 8.311 Release: 0 Summary: A simulation program for particle collisions at very high energies License: GPL-2.0-or-later @@ -107,6 +107,7 @@ %package doc Summary: Documentation for Pythia - a simulation program for particle collisions Group: Documentation/HTML +BuildArch: noarch %description doc Pythia can be used to generate high-energy-physics events, i.e. sets ++++++ pythia-examples-link-gmp.patch ++++++ --- /var/tmp/diff_new_pack.J9XGmz/_old 2024-03-18 16:45:48.469722799 +0100 +++ /var/tmp/diff_new_pack.J9XGmz/_new 2024-03-18 16:45:48.469722799 +0100 @@ -1,8 +1,8 @@ -Index: pythia8310/examples/Makefile +Index: pythia8311/examples/Makefile =================================================================== ---- pythia8310.orig/examples/Makefile -+++ pythia8310/examples/Makefile -@@ -107,7 +107,7 @@ endif +--- pythia8311.orig/examples/Makefile ++++ pythia8311/examples/Makefile +@@ -119,7 +119,7 @@ endif # FASTJET3. main71 main72 main75 main81 main82 main83: $(PYTHIA) $$@.cc ifeq ($(FASTJET3_USE),true) @@ -11,7 +11,7 @@ else $(error Error: $@ requires FASTJET3) endif -@@ -116,7 +116,7 @@ endif +@@ -128,7 +128,7 @@ endif main74: $(PYTHIA) $$@.cc ifeq ($(FASTJET3_USE),true) $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\ @@ -20,7 +20,7 @@ else $(error Error: $@ requires FASTJET3) endif -@@ -125,7 +125,7 @@ endif +@@ -137,7 +137,7 @@ endif main84: $(PYTHIA) $$@.cc ifeq ($(FASTJET3_USE)$(HEPMC3_USE),truetrue) $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\ ++++++ pythia-honour-env-cxxflags.patch ++++++ --- /var/tmp/diff_new_pack.J9XGmz/_old 2024-03-18 16:45:48.481723242 +0100 +++ /var/tmp/diff_new_pack.J9XGmz/_new 2024-03-18 16:45:48.485723389 +0100 @@ -1,14 +1,14 @@ -Index: pythia8307/configure +Index: pythia8311/configure =================================================================== ---- pythia8307.orig/configure -+++ pythia8307/configure -@@ -309,7 +309,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! +--- pythia8311.orig/configure ++++ pythia8311/configure +@@ -326,7 +326,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! warn "Unknown architecture $ARCH, set as LINUX."; ARCH="LINUX"; fi if [ -z "$CXX" ]; then warn "CXX not set, using g++."; CXX="g++"; fi if [ -z "$CXX_COMMON" ]; then -- CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}" -+ CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}${ENABLE_64BIT}" - CXX_COMMON="${CXX_COMMON}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC" +- CXX_COMMON="${ENABLE_DEBUG}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC" ++ CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC" CXX_COMMON="${CXX_COMMON} -pthread"; fi if [ -z "$CXX_SHARED" ]; then + if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi ++++++ pythia-remove-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.J9XGmz/_old 2024-03-18 16:45:48.505724127 +0100 +++ /var/tmp/diff_new_pack.J9XGmz/_new 2024-03-18 16:45:48.509724274 +0100 @@ -1,7 +1,7 @@ -Index: pythia8310/Makefile +Index: pythia8311/Makefile =================================================================== ---- pythia8310.orig/Makefile -+++ pythia8310/Makefile +--- pythia8311.orig/Makefile ++++ pythia8311/Makefile @@ -36,7 +36,11 @@ LOCAL_TMP=tmp LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(LOCAL_LIB)) CXX_COMMON:=-I$(LOCAL_INCLUDE) $(CXX_COMMON) @@ -27,36 +27,36 @@ $(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) $(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ -Index: pythia8310/configure +Index: pythia8311/configure =================================================================== ---- pythia8310.orig/configure -+++ pythia8310/configure +--- pythia8311.orig/configure ++++ pythia8311/configure @@ -30,6 +30,7 @@ Configuration options. --help : Print this help message (also -h, --h, and -help). --enable-debug : Turn on debugging and disable optimization. --enable-optdebug : Turn on debugging but allow optimization. +--disable-rpath : Disable use of rpath for linking. --lcg=PLATFORM : Specify the LCG platform to use when the - --with-PACKAGE-version option, described below, is set for - a given optional package [x86_64-slc6-gcc48-opt]. The -@@ -92,7 +93,7 @@ Advanced options. + --with-PACKAGE-version option, described below, + is set for a given optional package +@@ -95,7 +96,7 @@ Advanced options. --obj-common='FLAGS' : Set the common C++ flags used for object (.o) compilation only (not linking). BLOCKTEXT --OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --lcg" -+OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --disable-rpath --lcg" +-OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --lcg --lcg-ver" ++OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --disable-rpath --lcg --lcg-ver" OPTIONS+=" --prefix --prefix-bin --prefix-lib --prefix-include --prefix-share" for PKG in "evtgen" "fastjet3" "hepmc2" "hepmc3" "lhapdf5" "lhapdf6" "powheg"\ - "rivet" "root" "yoda" "gzip" "python" "mg5mes" "openmp" "mpich" "hdf5"\ -@@ -303,6 +304,7 @@ done - if [ "$LCG_SET" != true ]; then LCG=x86_64-slc6-gcc48-opt; fi + "rivet" "root" "gzip" "python" "mg5mes" "openmp" "mpich" "hdf5"\ +@@ -320,6 +321,7 @@ done + # Set the compilation flags and options (order matters). [ "$ENABLE_DEBUG_SET" = true ] && ENABLE_DEBUG="-g " || ENABLE_DEBUG="-O2 " [ "$ENABLE_OPTDEBUG_SET" = true ] && ENABLE_DEBUG="-g -O " +[ "$DISABLE_RPATH_SET" = true ] && DISABLE_RPATH="true" || DISABLE_RPATH="false" 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 -@@ -428,6 +430,7 @@ PREFIX_LIB=$PREFIX_LIB +@@ -453,6 +455,7 @@ PREFIX_LIB=$PREFIX_LIB PREFIX_SHARE=$PREFIX_SHARE # Compilation flags (see ./configure --help for further documentation). @@ -64,10 +64,10 @@ CXX=$CXX CXX_COMMON=$CXX_COMMON CXX_SHARED=$CXX_SHARED -Index: pythia8310/plugins/mg5mes/Makefile +Index: pythia8311/plugins/mg5mes/Makefile =================================================================== ---- pythia8310.orig/plugins/mg5mes/Makefile -+++ pythia8310/plugins/mg5mes/Makefile +--- pythia8311.orig/plugins/mg5mes/Makefile ++++ pythia8311/plugins/mg5mes/Makefile @@ -28,7 +28,11 @@ LOCAL_DIRS:=$(subst $(LOCAL_TMP)/,,$(wil LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB)) LOCAL_MKDIRS:=$(foreach DIR,$(LOCAL_DIRS),$(shell mkdir -p $(LOCAL_TMP)/$(DIR))) @@ -81,10 +81,10 @@ PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX) # Set the wrapper, determine the objects and targets. -Index: pythia8310/plugins/python/Makefile +Index: pythia8311/plugins/python/Makefile =================================================================== ---- pythia8310.orig/plugins/python/Makefile -+++ pythia8310/plugins/python/Makefile +--- pythia8311.orig/plugins/python/Makefile ++++ pythia8311/plugins/python/Makefile @@ -27,7 +27,11 @@ LOCAL_TMP=tmp LOCAL_INCLUDE=include LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB)) @@ -114,24 +114,17 @@ # Clean. clean: -Index: pythia8310/examples/Makefile +Index: pythia8311/examples/Makefile =================================================================== ---- pythia8310.orig/examples/Makefile -+++ pythia8310/examples/Makefile -@@ -26,14 +26,13 @@ ifneq ("$(wildcard ../lib/libpythia8.*)" +--- pythia8311.orig/examples/Makefile ++++ pythia8311/examples/Makefile +@@ -26,7 +26,7 @@ ifneq ("$(wildcard ../lib/libpythia8.*)" PREFIX_INCLUDE=../include endif - CXX_COMMON:=-I$(PREFIX_INCLUDE) $(CXX_COMMON) $(GZIP_LIB) + CXX_COMMON:=$(OBJ_COMMON) -I$(PREFIX_INCLUDE) $(CXX_COMMON) $(GZIP_LIB) -CXX_COMMON+= -L$(PREFIX_LIB) -Wl,-rpath,$(PREFIX_LIB) -lpythia8 -ldl +CXX_COMMON+= -L$(PREFIX_LIB) -lpythia8 -ldl PYTHIA=$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - # Fix missing runtime paths from RIVET. - ifeq ($(RIVET_USE),true) - COMMA=, - RIVET_LPATH=$(filter -L%,$(shell $(RIVET_BIN)$(RIVET_CONFIG) --ldflags)) -- RIVET_RPATH=$(subst -L,-Wl$(COMMA)-rpath$(COMMA),$(RIVET_LPATH)) - endif - - ################################################################################ + # Fix missing runtime paths from RIVET and determine C++ standard used. ++++++ pythia8310.tgz -> pythia8311.tgz ++++++ /work/SRC/openSUSE:Factory/pythia/pythia8310.tgz /work/SRC/openSUSE:Factory/.pythia.new.1905/pythia8311.tgz differ: char 5, line 1 ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.J9XGmz/_old 2024-03-18 16:45:48.541725455 +0100 +++ /var/tmp/diff_new_pack.J9XGmz/_new 2024-03-18 16:45:48.545725602 +0100 @@ -1,10 +1,10 @@ a variant was sent via mail to phil...@cern.ch -Index: pythia8310/configure +Index: pythia8311/configure =================================================================== ---- pythia8310.orig/configure -+++ pythia8310/configure -@@ -286,7 +286,7 @@ done +--- pythia8311.orig/configure ++++ pythia8311/configure +@@ -304,7 +304,7 @@ done # Parse the user arguments and evaluate each as a global variable. echo "# PYTHIA configuration file." > $CFG_FILE @@ -13,10 +13,10 @@ for VAR in "$@"; do if [[ $OPTIONS =~ (^| )${VAR%%=*}($| ) ]]; then echo "# $VAR" >> $CFG_FILE; -Index: pythia8310/Makefile +Index: pythia8311/Makefile =================================================================== ---- pythia8310.orig/Makefile -+++ pythia8310/Makefile +--- pythia8311.orig/Makefile ++++ pythia8311/Makefile @@ -128,11 +128,10 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW $(LOCAL_TMP)/LHAPowheg.o $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) $(CXX) $(LOCAL_TMP)/LHAPowheg.o -o $@ $(CXX_COMMON) $(CXX_SHARED)\
