Hello community, here is the log from the commit of package pythia for openSUSE:Leap:15.2 checked in at 2020-03-02 13:25:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/pythia (Old) and /work/SRC/openSUSE:Leap:15.2/.pythia.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Mon Mar 2 13:25:47 2020 rev:12 rq:780696 version:8.243 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/pythia/pythia.changes 2020-01-15 15:45:46.275334643 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.pythia.new.26092/pythia.changes 2020-03-02 13:25:51.234696193 +0100 @@ -1,0 +2,20 @@ +Wed Aug 21 08:06:55 UTC 2019 - Atri Bhattacharya <[email protected]> + +- Update to version 8.243: + + See + http://home.thep.lu.se/~torbjorn/pythia82html/UpdateHistory.html +- Rebase existing patches to apply cleanly. + +------------------------------------------------------------------- +Fri May 3 12:49:40 UTC 2019 - Atri Bhattacharya <[email protected]> + +- Update to version 8.240: + + See + http://home.thep.lu.se/~torbjorn/pythia82html/UpdateHistory.html +- Rebase existing patches to apply cleanly. +- Disable boost and drop boost BuildRequires as it is no longer + needed when compiling against LHAPDF >= 6.2. +- Remove unnecessary hidden files not cleaned up by build. +- Cleanups using spec-cleaner. + +------------------------------------------------------------------- Old: ---- pythia8235.tgz New: ---- pythia8243.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.E037zk/_old 2020-03-02 13:25:52.502698714 +0100 +++ /var/tmp/diff_new_pack.E037zk/_new 2020-03-02 13:25:52.506698721 +0100 @@ -1,7 +1,7 @@ # # spec file for package pythia # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,20 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define ver 8235 +%define ver 8243 %define soname lib%{name}8 - Name: pythia -Version: 8.235 +Version: 8.243 Release: 0 Summary: A simulation program for particle collisions at very high energies License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Url: http://home.thep.lu.se/~torbjorn/Pythia.html +URL: http://home.thep.lu.se/~torbjorn/Pythia.html Source: http://home.thep.lu.se/~torbjorn/pythia8/%{name}%{ver}.tgz # PATCH-FIX-UPSTREAM pythia-makefile-destdir-support.patch [email protected] -- Add DESTDIR support to makefile to prevent touching of buildroot in the %%build section Patch0: pythia-makefile-destdir-support.patch @@ -35,17 +34,11 @@ Patch2: pythia-remove-rpaths.patch BuildRequires: HepMC2-devel BuildRequires: LHAPDF-devel -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: fastjet-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: rsync BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Pythia can be used to generate high-energy-physics events, i.e. sets @@ -143,7 +136,6 @@ --disable-rpath \ --with-lhapdf6 \ --with-hepmc2 \ - --with-boost \ --with-gzip \ --with-fastjet3 @@ -159,7 +151,7 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +%make_install install -D -m0644 %{name}.csh %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh install -D -m0644 %{name}.sh %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh @@ -181,7 +173,12 @@ 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 +sed -E -i "s|%{_bindir}/env bash|/bin/bash|" %{buildroot}%{_bindir}/pythia8-config + +# REMOVE UNNECESSARY HIDDEN FILES +rm %{buildroot}%{_includedir}/Pythia8/._*.h +rm %{buildroot}%{_includedir}/Pythia8Plugins/._*.h +find %{buildroot}%{_docdir}/%{name}/ -name "._*" -delete -print %fdupes -s %{buildroot}%{_docdir}/%{name}/ @@ -194,7 +191,7 @@ do echo echo Now begin main${t} - make main${t} + make %{?_smp_mflags} main${t} time ./main${t} > out${t} done # TESTS 42 REQUIRES INPUT FILES; LOOP TO MAKE IT EASY TO ADD FUTURE TESTS @@ -202,30 +199,24 @@ do echo echo Now begin main${t} - make main${t} + make %{?_smp_mflags} main${t} time ./main${t} main${t}.cmnd hepmcout${t}.dat > out${t} done 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 %files -n %{soname} -%defattr(-,root,root) %{_libdir}/%{soname}.so %files -n %{soname}lhapdf6 -%defattr(-,root,root) %{_libdir}/%{soname}lhapdf6.so %files devel -%defattr(-,root,root) %doc AUTHORS GUIDELINES CODINGSTYLE README %license COPYING %{_bindir}/pythia8-config @@ -235,7 +226,6 @@ %{_docdir}/%{name}/xmldoc/ %files doc -%defattr(-,root,root) %dir %{_docdir}/%{name} %{_docdir}/%{name}/phpdoc/ %{_docdir}/%{name}/pdfdoc/ ++++++ pythia-honour-env-cxxflags.patch ++++++ --- /var/tmp/diff_new_pack.E037zk/_old 2020-03-02 13:25:52.526698761 +0100 +++ /var/tmp/diff_new_pack.E037zk/_new 2020-03-02 13:25:52.526698761 +0100 @@ -1,10 +1,10 @@ -Index: pythia8230/configure +Index: pythia8240/configure =================================================================== ---- 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 +--- pythia8240.orig/configure ++++ pythia8240/configure +@@ -297,7 +297,7 @@ if [ -z "$CXX" ]; then + CXX="g++"; + fi if [ -z "$CXX_COMMON" ]; then - CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}" + CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}${ENABLE_64BIT}" ++++++ pythia-makefile-destdir-support.patch ++++++ --- /var/tmp/diff_new_pack.E037zk/_old 2020-03-02 13:25:52.530698769 +0100 +++ /var/tmp/diff_new_pack.E037zk/_new 2020-03-02 13:25:52.534698777 +0100 @@ -1,8 +1,8 @@ -Index: pythia8230/Makefile +Index: pythia8240/Makefile =================================================================== ---- pythia8230.orig/Makefile -+++ pythia8230/Makefile -@@ -144,13 +144,13 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD +--- pythia8240.orig/Makefile ++++ pythia8240/Makefile +@@ -149,13 +149,13 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD # Install (rsync is used for finer control). install: all ++++++ pythia-remove-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.E037zk/_old 2020-03-02 13:25:52.538698785 +0100 +++ /var/tmp/diff_new_pack.E037zk/_new 2020-03-02 13:25:52.538698785 +0100 @@ -1,8 +1,8 @@ -Index: pythia8235/Makefile +Index: pythia8240/Makefile =================================================================== ---- pythia8235.orig/Makefile -+++ pythia8235/Makefile -@@ -58,19 +58,30 @@ ifeq ($(POWHEG_USE),true) +--- pythia8240.orig/Makefile ++++ pythia8240/Makefile +@@ -64,19 +64,30 @@ ifeq ($(POWHEG_USE),true) endif # Python. @@ -37,8 +37,8 @@ endif ################################################################################ -@@ -113,12 +124,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN - -I$(BOOST_INCLUDE) +@@ -118,12 +129,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN + $(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_LHAPDF) $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\ $(LOCAL_LIB)/libpythia8.a +ifneq ($(DISABLE_RPATH),true) @@ -61,7 +61,7 @@ # POWHEG (exclude any executable ending with sh). $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h -@@ -126,9 +147,15 @@ $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INC +@@ -131,9 +152,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 @@ -78,10 +78,10 @@ # Python (turn off all warnings for readability). $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h -Index: pythia8235/configure +Index: pythia8240/configure =================================================================== ---- pythia8235.orig/configure -+++ pythia8235/configure +--- pythia8240.orig/configure ++++ pythia8240/configure @@ -32,6 +32,7 @@ Configuration options. --enable-optdebug : Turn on debugging but allow optimization. --enable-64bit : Turn on 64-bit compilation. @@ -90,7 +90,7 @@ --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 -@@ -83,7 +84,7 @@ Advanced options. +@@ -87,7 +88,7 @@ Advanced options. for OS X. BLOCKTEXT OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --enable-64bit" @@ -99,23 +99,15 @@ 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 -@@ -201,6 +202,7 @@ if [ "$LCG_SET" != true ]; then LCG=x86_ +@@ -285,6 +286,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 -@@ -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 - -@@ -293,6 +296,7 @@ PREFIX_SHARE=$PREFIX_SHARE + if [ -z "$ARCH" ]; then + ARCH=$(uname | grep -i -o -e Linux -e Darwin); + fi +@@ -416,6 +418,7 @@ PREFIX_SHARE=$PREFIX_SHARE # Compilation flags (see ./configure --help for further documentation). ENABLE_SHARED=$ENABLE_SHARED @@ -123,10 +115,10 @@ CXX=$CXX CXX_COMMON=$CXX_COMMON CXX_SHARED=$CXX_SHARED -Index: pythia8235/examples/Makefile +Index: pythia8240/examples/Makefile =================================================================== ---- pythia8235.orig/examples/Makefile -+++ pythia8235/examples/Makefile +--- pythia8240.orig/examples/Makefile ++++ pythia8240/examples/Makefile @@ -25,7 +25,10 @@ GZIP_INC= GZIP_FLAGS= ifeq ($(GZIP_USE),true) ++++++ pythia8235.tgz -> pythia8243.tgz ++++++ /work/SRC/openSUSE:Leap:15.2/pythia/pythia8235.tgz /work/SRC/openSUSE:Leap:15.2/.pythia.new.26092/pythia8243.tgz differ: char 5, line 1
