Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2025-03-25 22:11:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pythia (Old) and /work/SRC/openSUSE:Factory/.pythia.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Tue Mar 25 22:11:33 2025 rev:31 rq:1255800 version:8.313 Changes: -------- --- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2024-03-18 16:45:47.233677204 +0100 +++ /work/SRC/openSUSE:Factory/.pythia.new.2696/pythia.changes 2025-03-25 22:20:12.333986293 +0100 @@ -1,0 +2,10 @@ +Mon Mar 24 07:49:27 UTC 2025 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 8.313: + * Too many changes to list, see https://pythia.org/history/. +- Minor rebase of all patches for update. +- Major rebase of pythia-examples-link-gmp.patch to apply against + updated make file. +- Revise disabled tests for %check. + +------------------------------------------------------------------- Old: ---- pythia8311.tgz New: ---- pythia8313.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.PTBGSp/_old 2025-03-25 22:20:13.498034606 +0100 +++ /var/tmp/diff_new_pack.PTBGSp/_new 2025-03-25 22:20:13.498034606 +0100 @@ -1,7 +1,7 @@ # # spec file for package pythia # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 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 8311 +%define ver 8313 %define soname lib%{name}8 Name: pythia -Version: 8.311 +Version: 8.313 Release: 0 Summary: A simulation program for particle collisions at very high energies License: GPL-2.0-or-later @@ -49,6 +49,7 @@ BuildRequires: rsync BuildRequires: pkgconfig(lhapdf) BuildRequires: pkgconfig(rivet) +BuildRequires: pkgconfig(yoda) BuildRequires: pkgconfig(zlib) %description @@ -125,7 +126,6 @@ # FIX EOF ENCODINGS sed -i 's/\r$//' share/Pythia8/pdfdata/mrstlostarstar.00.dat sed -i 's/\r$//' share/Pythia8/htmldoc/pythia.css -sed -i 's/\r$//' examples/main29.cc sed -E -i "s|%{_bindir}/env bash|/bin/bash|" examples/runmains @@ -184,17 +184,17 @@ export ncpus=%(echo %{?_smp_mflags} | sed "s/^\-j//") pushd examples # SECTION Disabled examples: -# 23: MixMax header deleted as it is non-free -# 46, 48: Require evtgen which oS does not have packaged -# 91, 92, 93: Require root6 which is not avaliable in Factory -./runmains --skip="23 46 48 91 92 93" --threads="${ncpus}" +## 114: needs yoda2 +## 136, 164: need highfive library +## 141-143: need ROOT +## 245: needs MixMax +## 364: needs evtgen +./runmains --skip="114 136 141 142 143 164 245 364" --threads="${ncpus}" # /SECTION popd -%post -n %{soname} -p /sbin/ldconfig -%postun -n %{soname} -p /sbin/ldconfig -%post -n %{soname}lhapdf6 -p /sbin/ldconfig -%postun -n %{soname}lhapdf6 -p /sbin/ldconfig +%ldconfig_scriptlets -n %{soname} +%ldconfig_scriptlets -n %{soname}lhapdf6 %files -n %{soname} %{_libdir}/%{soname}.so @@ -210,7 +210,7 @@ %{_includedir}/Pythia8/ %{_includedir}/Pythia8Plugins/ %{_docdir}/%{name}/pdfdata/ -%{_docdir}/%{name}/settings/ +%{_docdir}/%{name}/tunes/ %{_docdir}/%{name}/xmldoc/ %files doc ++++++ pythia-examples-link-gmp.patch ++++++ --- /var/tmp/diff_new_pack.PTBGSp/_old 2025-03-25 22:20:13.522035602 +0100 +++ /var/tmp/diff_new_pack.PTBGSp/_new 2025-03-25 22:20:13.526035768 +0100 @@ -1,32 +1,18 @@ -Index: pythia8311/examples/Makefile +--- + examples/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: pythia8313/examples/Makefile =================================================================== ---- 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) -- $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE) $(FASTJET3_LIB) -+ $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE) $(FASTJET3_LIB) -lgmp - else - $(error Error: $@ requires FASTJET3) - endif -@@ -128,7 +128,7 @@ endif - main74: $(PYTHIA) $$@.cc - ifeq ($(FASTJET3_USE),true) - $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\ -- $(FASTJET3_LIB) -lfastjettools -lRecursiveTools -+ $(FASTJET3_LIB) -lfastjettools -lRecursiveTools -lgmp - else - $(error Error: $@ requires FASTJET3) - endif -@@ -137,7 +137,7 @@ endif - main84: $(PYTHIA) $$@.cc - ifeq ($(FASTJET3_USE)$(HEPMC3_USE),truetrue) - $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\ -- $(HEPMC3_INCLUDE) $(FASTJET3_LIB) $(HEPMC3_LIB) -+ $(HEPMC3_INCLUDE) $(FASTJET3_LIB) $(HEPMC3_LIB) -lgmp - else - $(error Error: $@ requires FASTJET3 and HEPMC3) +--- pythia8313.orig/examples/Makefile ++++ pythia8313/examples/Makefile +@@ -55,7 +55,7 @@ HEPMC2_OPTS=$(HEPMC2_INCLUDE) $(HEPMC2_L + HEPMC3_OPTS=$(HEPMC3_INCLUDE) $(HEPMC3_LIB) -DHEPMC3 + HDF5_OPTS=$(HDF5_INCLUDE) $(HIGHFIVE_INCLUDE) $(MPICH_INCLUDE) + HDF5_OPTS+= $(HDF5_LIB) -DHDF5 +-FASTJET3_OPTS=$(FASTJET3_INCLUDE) $(FASTJET3_LIB) ++FASTJET3_OPTS=$(FASTJET3_INCLUDE) $(FASTJET3_LIB) -lgmp + ifeq ($(ROOT_USE),true) + ROOT_OPTS=$(ROOT_LIB) $(shell $(ROOT_CONFIG) --cflags --glibs) -DPY8ROOT endif ++++++ pythia-honour-env-cxxflags.patch ++++++ --- /var/tmp/diff_new_pack.PTBGSp/_old 2025-03-25 22:20:13.538036267 +0100 +++ /var/tmp/diff_new_pack.PTBGSp/_new 2025-03-25 22:20:13.542036433 +0100 @@ -1,8 +1,8 @@ -Index: pythia8311/configure +Index: pythia8313/configure =================================================================== ---- pythia8311.orig/configure -+++ pythia8311/configure -@@ -326,7 +326,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! +--- pythia8313.orig/configure ++++ pythia8313/configure +@@ -327,7 +327,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 ++++++ pythia-makefile-destdir-support.patch ++++++ --- /var/tmp/diff_new_pack.PTBGSp/_old 2025-03-25 22:20:13.554036931 +0100 +++ /var/tmp/diff_new_pack.PTBGSp/_new 2025-03-25 22:20:13.558037097 +0100 @@ -1,8 +1,8 @@ -Index: pythia8310/Makefile +Index: pythia8313/Makefile =================================================================== ---- pythia8310.orig/Makefile -+++ pythia8310/Makefile -@@ -140,12 +140,12 @@ python: $(LOCAL_LIB)/libpythia8$(LIB_SUF +--- pythia8313.orig/Makefile ++++ pythia8313/Makefile +@@ -141,12 +141,12 @@ python: $(LOCAL_LIB)/libpythia8$(LIB_SUF # Install. install: all ++++++ pythia-remove-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.PTBGSp/_old 2025-03-25 22:20:13.570037594 +0100 +++ /var/tmp/diff_new_pack.PTBGSp/_new 2025-03-25 22:20:13.574037761 +0100 @@ -1,7 +1,15 @@ -Index: pythia8311/Makefile +--- + Makefile | 10 +++++++++- + configure | 5 ++++- + examples/Makefile | 2 +- + plugins/mg5mes/Makefile | 6 +++++- + plugins/python/Makefile | 12 +++++++++++- + 5 files changed, 30 insertions(+), 5 deletions(-) + +Index: pythia8313/Makefile =================================================================== ---- pythia8311.orig/Makefile -+++ pythia8311/Makefile +--- pythia8313.orig/Makefile ++++ pythia8313/Makefile @@ -36,7 +36,11 @@ LOCAL_TMP=tmp LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(LOCAL_LIB)) CXX_COMMON:=-I$(LOCAL_INCLUDE) $(CXX_COMMON) @@ -15,22 +23,22 @@ # PYTHIA. OBJECTS=$(patsubst $(LOCAL_SRC)/%.cc,$(LOCAL_TMP)/%.o,\ -@@ -124,7 +128,11 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW +@@ -125,7 +129,11 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW $(LOCAL_TMP)/LHAPowheg.o $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) $(CXX) $(LOCAL_TMP)/LHAPowheg.o -o $@ $(CXX_COMMON) $(CXX_SHARED)\ $(CXX_SONAME)$(notdir $@) -Llib -lpythia8\ +ifneq ($(DISABLE_RPATH),true) - -Wl,-rpath,../lib:$(POWHEG_BIN) -L$(POWHEG_BIN) -l$* + -Wl,-rpath,../lib:$(POWHEG_DIR) -L$(POWHEG_DIR) -l$* +else -+ -L$(POWHEG_BIN) -l$* ++ -L$(POWHEG_DIR) -l$* +endif $(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) $(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ -Index: pythia8311/configure +Index: pythia8313/configure =================================================================== ---- pythia8311.orig/configure -+++ pythia8311/configure +--- pythia8313.orig/configure ++++ pythia8313/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. @@ -39,7 +47,7 @@ --lcg=PLATFORM : Specify the LCG platform to use when the --with-PACKAGE-version option, described below, is set for a given optional package -@@ -95,7 +96,7 @@ Advanced options. +@@ -96,7 +97,7 @@ Advanced options. --obj-common='FLAGS' : Set the common C++ flags used for object (.o) compilation only (not linking). BLOCKTEXT @@ -47,8 +55,8 @@ +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" "gzip" "python" "mg5mes" "openmp" "mpich" "hdf5"\ -@@ -320,6 +321,7 @@ done + "rivet" "yoda" "root" "gzip" "python" "mg5mes" "openmp" "mpich" "hdf5"\ +@@ -321,6 +322,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 " @@ -56,18 +64,18 @@ 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 -@@ -453,6 +455,7 @@ PREFIX_LIB=$PREFIX_LIB +@@ -464,6 +466,7 @@ PREFIX_LIB=$PREFIX_LIB PREFIX_SHARE=$PREFIX_SHARE # Compilation flags (see ./configure --help for further documentation). +DISABLE_RPATH=$DISABLE_RPATH CXX=$CXX + CXX_DTAGS=$CXX_DTAGS CXX_COMMON=$CXX_COMMON - CXX_SHARED=$CXX_SHARED -Index: pythia8311/plugins/mg5mes/Makefile +Index: pythia8313/plugins/mg5mes/Makefile =================================================================== ---- pythia8311.orig/plugins/mg5mes/Makefile -+++ pythia8311/plugins/mg5mes/Makefile +--- pythia8313.orig/plugins/mg5mes/Makefile ++++ pythia8313/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 +89,10 @@ PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX) # Set the wrapper, determine the objects and targets. -Index: pythia8311/plugins/python/Makefile +Index: pythia8313/plugins/python/Makefile =================================================================== ---- pythia8311.orig/plugins/python/Makefile -+++ pythia8311/plugins/python/Makefile +--- pythia8313.orig/plugins/python/Makefile ++++ pythia8313/plugins/python/Makefile @@ -27,7 +27,11 @@ LOCAL_TMP=tmp LOCAL_INCLUDE=include LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB)) @@ -114,10 +122,10 @@ # Clean. clean: -Index: pythia8311/examples/Makefile +Index: pythia8313/examples/Makefile =================================================================== ---- pythia8311.orig/examples/Makefile -+++ pythia8311/examples/Makefile +--- pythia8313.orig/examples/Makefile ++++ pythia8313/examples/Makefile @@ -26,7 +26,7 @@ ifneq ("$(wildcard ../lib/libpythia8.*)" PREFIX_INCLUDE=../include endif @@ -126,5 +134,5 @@ +CXX_COMMON+= -L$(PREFIX_LIB) -lpythia8 -ldl PYTHIA=$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - # Fix missing runtime paths from RIVET and determine C++ standard used. + # Define RIVET options and fix C++ version, rpath, missing HDF5. ++++++ pythia8311.tgz -> pythia8313.tgz ++++++ /work/SRC/openSUSE:Factory/pythia/pythia8311.tgz /work/SRC/openSUSE:Factory/.pythia.new.2696/pythia8313.tgz differ: char 5, line 1 ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.PTBGSp/_old 2025-03-25 22:20:13.602038923 +0100 +++ /var/tmp/diff_new_pack.PTBGSp/_new 2025-03-25 22:20:13.606039089 +0100 @@ -1,10 +1,24 @@ a variant was sent via mail to phil...@cern.ch -Index: pythia8311/configure +--- + Makefile | 7 +++---- + configure | 4 ++-- + 2 files changed, 5 insertions(+), 6 deletions(-) + +Index: pythia8313/configure =================================================================== ---- pythia8311.orig/configure -+++ pythia8311/configure -@@ -304,7 +304,7 @@ done +--- pythia8313.orig/configure ++++ pythia8313/configure +@@ -294,7 +294,7 @@ function error() { + ################################################################################ + + # Check if help requested. +-bold "Running PYTHIA configuration script. Now is `date`" ++bold "Running PYTHIA configuration script" + for VAR in "$@"; do + if [ "$VAR" = "-h" ] || [ "$VAR" = "--h" ] || [ "$VAR" = "-help" ] \ + || [ "$VAR" = "--help" ]; then +@@ -305,7 +305,7 @@ done # Parse the user arguments and evaluate each as a global variable. echo "# PYTHIA configuration file." > $CFG_FILE @@ -13,21 +27,21 @@ for VAR in "$@"; do if [[ $OPTIONS =~ (^| )${VAR%%=*}($| ) ]]; then echo "# $VAR" >> $CFG_FILE; -Index: pythia8311/Makefile +Index: pythia8313/Makefile =================================================================== ---- pythia8311.orig/Makefile -+++ pythia8311/Makefile -@@ -128,11 +128,10 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW +--- pythia8313.orig/Makefile ++++ pythia8313/Makefile +@@ -129,11 +129,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)\ $(CXX_SONAME)$(notdir $@) -Llib -lpythia8\ -ifneq ($(DISABLE_RPATH),true) -- -Wl,-rpath,../lib:$(POWHEG_BIN) -L$(POWHEG_BIN) -l$* +- -Wl,-rpath,../lib:$(POWHEG_DIR) -L$(POWHEG_DIR) -l$* -else -+ ifneq($(DISABLE_RPATH),true) -+ -Wl,-rpath,../lib:$(POWHEG_BIN)\ -+ endif - -L$(POWHEG_BIN) -l$* ++ ifneq ($(DISABLE_RPATH),true) ++ -Wl,-rpath,../lib:$(POWHEG_DIR)\ ++ endif + -L$(POWHEG_DIR) -l$* -endif $(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
