Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2016-09-07 11:45:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pythia (Old) and /work/SRC/openSUSE:Factory/.pythia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Changes: -------- --- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2016-02-03 10:20:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pythia.new/pythia.changes 2016-09-07 11:45:29.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 2 01:42:56 UTC 2016 - [email protected] + +- Update to version 8.219: + + See list of changes at: + http://home.thep.lu.se/~torbjorn/Pythia.html + or locally at + /usr/share/doc/packages/pythia/htmldoc/UpdateHistory.html. +- Rebase patches so that they apply cleanly against updated + version. +- Add pythia-remove-rpaths.patch to remove rpath usage when + building shared libraries. + +------------------------------------------------------------------- Old: ---- pythia8215.tgz New: ---- pythia-remove-rpaths.patch pythia8219.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.M3eAQJ/_old 2016-09-07 11:45:37.000000000 +0200 +++ /var/tmp/diff_new_pack.M3eAQJ/_new 2016-09-07 11:45:37.000000000 +0200 @@ -16,11 +16,11 @@ # -%define ver 8215 +%define ver 8219 %define soname lib%{name}8 Name: pythia -Version: 8.215 +Version: 8.219 Release: 0 Summary: A simulation program for particle collisions at very high energies License: GPL-2.0 @@ -31,6 +31,8 @@ Patch0: pythia-makefile-destdir-support.patch # PATCH-FIX-UPSTREAM pythia-honour-env-cxxflags.patch [email protected] -- Append CXXFLAGS from env to default compilations flags; this allows us to pass RPM_OPT_FLAGS during compilation 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 BuildRequires: HepMC-devel BuildRequires: LHAPDF-devel BuildRequires: boost-devel @@ -150,6 +152,7 @@ %setup -q -n %{name}%{ver} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # FIX EOF ENCODINGS ++++++ pythia-honour-env-cxxflags.patch ++++++ --- /var/tmp/diff_new_pack.M3eAQJ/_old 2016-09-07 11:45:37.000000000 +0200 +++ /var/tmp/diff_new_pack.M3eAQJ/_new 2016-09-07 11:45:37.000000000 +0200 @@ -1,8 +1,8 @@ -Index: pythia8215/configure +Index: pythia8219/configure =================================================================== ---- pythia8215.orig/configure -+++ pythia8215/configure -@@ -208,7 +208,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! +--- pythia8219.orig/configure ++++ pythia8219/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 @@ -11,18 +11,18 @@ CXX_COMMON="$CXX_COMMON -pedantic -W -Wall -Wshadow -fPIC"; fi if [ -z "$CXX_SHARED" ]; then if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi -Index: pythia8215/bin/pythia8-config +Index: pythia8219/bin/pythia8-config =================================================================== ---- pythia8215.orig/bin/pythia8-config -+++ pythia8215/bin/pythia8-config -@@ -68,8 +68,8 @@ elif [ ! -f $CFG_FILE ]; then - echo "Error: cannot find valid configuration for Pythia 8"; exit; fi +--- pythia8219.orig/bin/pythia8-config ++++ pythia8219/bin/pythia8-config +@@ -70,8 +70,8 @@ elif [ ! -f $CFG_FILE ]; then while read LINE; do + if [[ $LINE == \#\ --* ]]; then CONFIG+=${LINE#?}; fi if [[ $LINE != *=* ]]; then continue; fi - VAR=${LINE%=*}; VAL=${LINE#$KEY}; VAL=${VAL#*=}; - eval $VAR=\"$VAL\"; done < $CFG_FILE + VAR=${LINE%%=*}; VAL=${LINE#$KEY}; VAL=${VAL#*=}; + eval $VAR=\"${VAL}\"; done < $CFG_FILE - # Change the prefixes if local version. - if [ "$CFG_FILE" = "$PREFIX/Makefile.inc" ]; then + # Check if configuration is requested. + for VAR in "$@"; do ++++++ pythia-makefile-destdir-support.patch ++++++ --- /var/tmp/diff_new_pack.M3eAQJ/_old 2016-09-07 11:45:37.000000000 +0200 +++ /var/tmp/diff_new_pack.M3eAQJ/_new 2016-09-07 11:45:37.000000000 +0200 @@ -1,8 +1,8 @@ -Index: pythia8215/Makefile +Index: pythia8219/Makefile =================================================================== ---- pythia8215.orig/Makefile -+++ pythia8215/Makefile -@@ -120,12 +120,12 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW +--- pythia8219.orig/Makefile ++++ pythia8219/Makefile +@@ -142,12 +142,12 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD # Install (rsync is used for finer control). install: all ++++++ pythia-remove-rpaths.patch ++++++ Index: pythia8219/Makefile =================================================================== --- pythia8219.orig/Makefile +++ pythia8219/Makefile @@ -55,19 +55,19 @@ ifeq ($(POWHEG_USE),true) endif # Python. -PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB) +PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) ifeq ($(PYTHON_USE),true) TARGETS+=$(LOCAL_LIB)/_pythia8.so endif # GZIP. OBJ_COMMON=-MD $(CXX_COMMON) -LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl +LIB_COMMON=-ldl ifeq ($(GZIP_USE),true) PYTHON_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) - PYTHON_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz + PYTHON_COMMON+= -L$(GZIP_LIB) -lz OBJ_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) - LIB_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz + LIB_COMMON+= -L$(GZIP_LIB) -lz endif ################################################################################ @@ -110,11 +110,11 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\ $(LOCAL_LIB)/libpythia8.a $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME),$(notdir $@)\ - -L$(LHAPDF5_LIB) -Wl,-rpath,$(LHAPDF5_LIB) -lLHAPDF -lgfortran + -L$(LHAPDF5_LIB) -lLHAPDF -lgfortran $(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 + -L$(LHAPDF6_LIB) -lLHAPDF # POWHEG (exclude any executable ending with sh). $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h @@ -124,7 +124,7 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW $(LOCAL_LIB)/libpythia8.a 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 $<) + $(CXX_SONAME),$(notdir $@) ; rm $(notdir $<) # Python (turn off all warnings for readability). $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h ++++++ pythia8215.tgz -> pythia8219.tgz ++++++ /work/SRC/openSUSE:Factory/pythia/pythia8215.tgz /work/SRC/openSUSE:Factory/.pythia.new/pythia8219.tgz differ: char 5, line 1
