Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2018-05-13 16:04:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pythia (Old) and /work/SRC/openSUSE:Factory/.pythia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Sun May 13 16:04:43 2018 rev:19 rq:603526 version:8.235 Changes: -------- --- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2017-09-13 22:31:48.459170890 +0200 +++ /work/SRC/openSUSE:Factory/.pythia.new/pythia.changes 2018-05-13 16:04:45.379007698 +0200 @@ -1,0 +2,29 @@ +Mon Apr 30 22:09:08 UTC 2018 - [email protected] + +- Update to version 8.235: + + See + http://home.thep.lu.se/~torbjorn/pythia82html/UpdateHistory.html +- Rebase pythia-remove-rpaths.patch +- Drop bundled header file MixMax.h which is not used by pythia + directly and violates GPL copyright. +- Update License to GPL-2.0-or-later in keeping with upstream + change. +- Use %%license to install COPYING file instead of %%doc. +- Remove no-longer needed post-install mosifications: + + The correct permission for pythia8-config binary is set by + install script; stop setting it manually + + Rpaths are already removed from the shared libraries; don't + execute chrpath to do this. Also drop BuildRequires: chrpath. + + Don't remove non-existent backup file. + +------------------------------------------------------------------- +Mon Oct 9 10:20:22 UTC 2017 - [email protected] + +- Update to version 8.230: + + Long list of changes, see + http://home.thep.lu.se/~torbjorn/Pythia.html. +- Drop python-dont-force-std-cxx98.patch, incorporated into + upstream sources. +- Rebase existing patches. + +------------------------------------------------------------------- Old: ---- pythia8226.tgz python-dont-force-std-cxx98.patch New: ---- pythia8235.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.dTkh7T/_old 2018-05-13 16:04:50.466822082 +0200 +++ /var/tmp/diff_new_pack.dTkh7T/_new 2018-05-13 16:04:50.470821936 +0200 @@ -1,7 +1,7 @@ # # spec file for package pythia # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%define ver 8226 +%define ver 8235 %define soname lib%{name}8 Name: pythia -Version: 8.226 +Version: 8.235 Release: 0 Summary: A simulation program for particle collisions at very high energies -License: GPL-2.0 +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Url: http://home.thep.lu.se/~torbjorn/Pythia.html Source: http://home.thep.lu.se/~torbjorn/pythia8/%{name}%{ver}.tgz @@ -33,8 +33,6 @@ 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: HepMC2-devel BuildRequires: LHAPDF-devel %if 0%{?suse_version} > 1325 @@ -42,7 +40,6 @@ %else BuildRequires: boost-devel %endif -BuildRequires: chrpath BuildRequires: fastjet-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -119,11 +116,13 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # REMOVE UNNEEDED .orig FILES FROM THE examples DIR rm -f examples/Makefile.orig +# REMOVE NON-FREE HEADER FILE NOT USED BY PYTHIA DIRECTLY +rm include/Pythia8Plugins/MixMax.h + %build # FIX EOF ENCODINGS sed -i 's/\r$//' share/Pythia8/xmldoc/mrstlostarstar.00.dat @@ -168,9 +167,6 @@ # REMOVE STATIC LIBRARY rm %{buildroot}%{_libdir}/libpythia8.a -# REMOVE RPATHS -chrpath --delete %{buildroot}%{_libdir}/libpythia8lhapdf6.so - # REMOVE AUTHORS, COPYING, GUIDELINES AND README FILES AND BUNDLE THEM IN MAIN PACKAGE USING %%doc for i in AUTHORS COPYING GUIDELINES README do @@ -181,8 +177,11 @@ sed -i "s|%{buildroot}||g" %{buildroot}%{_bindir}/pythia8-config sed -i "s|%{buildroot}||g" %{buildroot}%{_docdir}/%{name}/examples/Makefile.inc -# MAKE SCRIPT EXECUTABLE -chmod +x %{buildroot}%{_bindir}/pythia8-config +# REMOVE SPURIOUS EXECUTABLE PERMISSIONS +chmod -x %{buildroot}%{_docdir}/%{name}/xmldoc/GKG18_DPDF_Fit*.dat + +# FIX env BASED HASHBANG +sed -E -i "s|/usr/bin/env bash|/bin/bash|" %{buildroot}%{_bindir}/pythia8-config %fdupes -s %{buildroot}%{_docdir}/%{name}/ @@ -227,7 +226,8 @@ %files devel %defattr(-,root,root) -%doc AUTHORS COPYING GUIDELINES CODINGSTYLE README +%doc AUTHORS GUIDELINES CODINGSTYLE README +%license COPYING %{_bindir}/pythia8-config %{_includedir}/Pythia8/ %{_includedir}/Pythia8Plugins/ ++++++ pythia-honour-env-cxxflags.patch ++++++ --- /var/tmp/diff_new_pack.dTkh7T/_old 2018-05-13 16:04:50.498820915 +0200 +++ /var/tmp/diff_new_pack.dTkh7T/_new 2018-05-13 16:04:50.502820769 +0200 @@ -1,28 +1,13 @@ -Index: pythia8226/configure +Index: pythia8230/configure =================================================================== ---- pythia8226.orig/configure -+++ pythia8226/configure -@@ -209,7 +209,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! +--- pythia8230.orig/configure ++++ pythia8230/configure +@@ -208,7 +208,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}-std=c++98" -+ CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}${ENABLE_64BIT}-std=c++98" +- CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}" ++ 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 -Index: pythia8226/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 - 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 - - # Check if configuration is requested. - for VAR in "$@"; do ++++++ pythia-makefile-destdir-support.patch ++++++ --- /var/tmp/diff_new_pack.dTkh7T/_old 2018-05-13 16:04:50.514820331 +0200 +++ /var/tmp/diff_new_pack.dTkh7T/_new 2018-05-13 16:04:50.514820331 +0200 @@ -1,18 +1,20 @@ -Index: pythia8226/Makefile +Index: pythia8230/Makefile =================================================================== ---- pythia8226.orig/Makefile -+++ pythia8226/Makefile -@@ -143,12 +143,12 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD +--- pythia8230.orig/Makefile ++++ pythia8230/Makefile +@@ -144,13 +144,13 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD # Install (rsync is used for finer control). install: all - mkdir -p $(PREFIX_BIN) $(PREFIX_INCLUDE) $(PREFIX_LIB) $(PREFIX_SHARE) +- rm -f $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - rsync -a $(LOCAL_BIN)/* $(PREFIX_BIN) --exclude .svn - rsync -a $(LOCAL_INCLUDE)/* $(PREFIX_INCLUDE) --exclude .svn - rsync -a $(LOCAL_LIB)/* $(PREFIX_LIB) --exclude .svn - rsync -a $(LOCAL_SHARE)/* $(PREFIX_SHARE) --exclude .svn - rsync -a $(LOCAL_EXAMPLE) $(PREFIX_SHARE) --exclude .svn + mkdir -p $(DESTDIR)/$(PREFIX_BIN) $(DESTDIR)/$(PREFIX_INCLUDE) $(DESTDIR)/$(PREFIX_LIB) $(DESTDIR)/$(PREFIX_SHARE) ++ rm -f $(DESTDIR)/$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + rsync -a $(LOCAL_BIN)/* $(DESTDIR)/$(PREFIX_BIN) --exclude .svn + rsync -a $(LOCAL_INCLUDE)/* $(DESTDIR)/$(PREFIX_INCLUDE) --exclude .svn + rsync -a $(LOCAL_LIB)/* $(DESTDIR)/$(PREFIX_LIB) --exclude .svn ++++++ pythia-remove-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.dTkh7T/_old 2018-05-13 16:04:50.522820039 +0200 +++ /var/tmp/diff_new_pack.dTkh7T/_new 2018-05-13 16:04:50.526819893 +0200 @@ -1,7 +1,7 @@ -Index: pythia8226/Makefile +Index: pythia8235/Makefile =================================================================== ---- pythia8226.orig/Makefile -+++ pythia8226/Makefile +--- pythia8235.orig/Makefile ++++ pythia8235/Makefile @@ -58,19 +58,30 @@ ifeq ($(POWHEG_USE),true) endif @@ -37,8 +37,8 @@ endif ################################################################################ -@@ -112,12 +123,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN - -I$(BOOST_INCLUDE) $(CXX_COMMON) +@@ -113,12 +124,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN + -I$(BOOST_INCLUDE) $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\ $(LOCAL_LIB)/libpythia8.a +ifneq ($(DISABLE_RPATH),true) @@ -50,19 +50,18 @@ +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 +else -+ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ + $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ +- -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF + -L$(LHAPDF6_LIB) -lLHAPDF +endif # POWHEG (exclude any executable ending with sh). $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h -@@ -125,9 +146,15 @@ $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INC +@@ -126,9 +147,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 @@ -79,44 +78,44 @@ # Python (turn off all warnings for readability). $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h -Index: pythia8226/configure +Index: pythia8235/configure =================================================================== ---- pythia8226.orig/configure -+++ pythia8226/configure -@@ -31,6 +31,7 @@ Configuration options. - --enable-debug : Turn on debugging and disable optimization. +--- pythia8235.orig/configure ++++ pythia8235/configure +@@ -32,6 +32,7 @@ Configuration options. + --enable-optdebug : Turn on debugging but allow optimization. --enable-64bit : Turn on 64-bit compilation. --enable-shared : Build the shared PYTHIA library during compilation. +--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 packages -@@ -85,7 +86,7 @@ Advanced options. +@@ -83,7 +84,7 @@ Advanced options. for OS X. BLOCKTEXT - OPTIONS="-h --h -help --help --enable-debug --enable-64bit" + OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --enable-64bit" -OPTIONS+=" --enable-shared --lcg" +OPTIONS+=" --enable-shared --disable-rpath --lcg" OPTIONS+=" --prefix --prefix-bin --prefix-lib --prefix-include --prefix-share" for PKG in "evtgen" "fastjet3" "hepmc2" "hepmc3" "lhapdf5" "lhapdf6" "powheg"\ "promc" "root" "gzip" "boost" "python"; do -@@ -203,6 +204,7 @@ if [ "$LCG_SET" != true ]; then LCG=x86_ - [ "$ENABLE_DEBUG_SET" = true ] && ENABLE_DEBUG="-g " || ENABLE_DEBUG="-O2 " +@@ -201,6 +202,7 @@ if [ "$LCG_SET" != true ]; then LCG=x86_ + [ "$ENABLE_OPTDEBUG_SET" = true ] && ENABLE_DEBUG="-g -O " [ "$ENABLE_64BIT_SET" = true ] && ENABLE_64BIT="-m64 " || ENABLE_64BIT="" [ "$ENABLE_SHARED_SET" = true ] && ENABLE_SHARED="true" || ENABLE_SHARED="false" +[ "$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 -@@ -287,6 +289,7 @@ echo "Configured for $ARCH with the foll - if [ "$ENABLE_DEBUG_SET" = true ]; then echo "--enable-debug"; fi +@@ -282,6 +284,7 @@ if [ "$ENABLE_DEBUG_SET" = true ]; then + if [ "$ENABLE_OPTDEBUG_SET" = true ]; then echo "--enable-optdebug"; fi if [ "$ENABLE_64BIT_SET" = true ]; then echo "--enable-64bit"; fi if [ "$ENABLE_SHARED_SET" = true ]; then echo "--enable-shared"; fi +if [ "$DISABLE_RPATH_SET" = true ]; then echo "--disable-rpath"; fi if [ "$LCG_SET" = true ]; then echo "--lcg=$LCG"; fi cat >> $CFG_FILE << BLOCKTEXT -@@ -298,6 +301,7 @@ PREFIX_SHARE=$PREFIX_SHARE +@@ -293,6 +296,7 @@ PREFIX_SHARE=$PREFIX_SHARE # Compilation flags (see ./configure --help for further documentation). ENABLE_SHARED=$ENABLE_SHARED @@ -124,18 +123,18 @@ CXX=$CXX CXX_COMMON=$CXX_COMMON CXX_SHARED=$CXX_SHARED -Index: pythia8226/examples/Makefile +Index: pythia8235/examples/Makefile =================================================================== ---- pythia8226.orig/examples/Makefile -+++ pythia8226/examples/Makefile -@@ -23,7 +23,10 @@ SHELL=/usr/bin/env bash - # Handle GZIP support. +--- pythia8235.orig/examples/Makefile ++++ pythia8235/examples/Makefile +@@ -25,7 +25,10 @@ GZIP_INC= + GZIP_FLAGS= ifeq ($(GZIP_USE),true) - CXX_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) -- CXX_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz -+ CXX_COMMON+= -L$(GZIP_LIB) -lz + GZIP_INC+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) +- GZIP_FLAGS+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz ++ GZIP_FLAGS+= -L$(GZIP_LIB) -lz + ifneq ($(DISABLE_RPATH),true) -+ CXX_COMMON+= -Wl,-rpath,$(GZIP_LIB) ++ GZIP_FLAGS+= -Wl,-rpath,$(GZIP_LIB) + endif endif ++++++ pythia8226.tgz -> pythia8235.tgz ++++++ /work/SRC/openSUSE:Factory/pythia/pythia8226.tgz /work/SRC/openSUSE:Factory/.pythia.new/pythia8235.tgz differ: char 5, line 1
