Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2015-08-14 14:47:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-29 21:10:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pythia.new/pythia.changes 2015-08-14 14:47:29.000000000 +0200 @@ -1,0 +2,38 @@ +Fri Aug 14 11:33:44 UTC 2015 - [email protected] + +- Change postinstall scripts to run ldconfig directly + +------------------------------------------------------------------- +Fri Aug 14 05:18:52 UTC 2015 - [email protected] + +- Update to version 8.210: + + Bug fix in CKKW-L merging for LHE files, such that the + factorization and renormalization scales are set by the SCALUP + value if the muf2 and mur2 LHEF3 attributes have not been set, + and the user has not set any explicit values; this change + restores the PYTHIA 8.1 behaviour. + + Various technical improvements in the machinery for hard + diffraction. + + Correct quark flavour selection when a string spanned directly + between two junctions is split up. + + Check that SK-I and SK-II colour reconnection machineries only + are called for event topologies they are set up to handle. + + Bug fixes in partial widths of the W' boson. Results are + correct when the W' is a simply rescaled copy of the W, but + not for more general couplings. Thanks to Mihail Chizhov. + + Minor fix in default location of PDF data files in the + constructors. No practical consequence since correct + non-default values are used. + + Tiny fix in the configure script, so that CXX options + containing an equal sign are parsed correctly. +- Changes from version 8.202 through 8.209: + + See /usr/share/doc/packages/pythia/htmldoc/UpdateHistory.html. +- Add pythia-makefile-destdir-support.patch to enable DESTDIR + support in the Makefile; makes configure stage buildroot-free + and prevents an ugly BUILDROOT trace in the shlib. +- Enable additional bindings now that all necessary deps are in + Factory; new subpackage: libpythia8lhapdf6. +- Add BuildRequires: chrpath; required to cleanup rpath in + libpythia8lhapdf6.so. + +------------------------------------------------------------------- Old: ---- pythia8201.tgz New: ---- pythia-makefile-destdir-support.patch pythia8210.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.FDe25y/_old 2015-08-14 14:47:31.000000000 +0200 +++ /var/tmp/diff_new_pack.FDe25y/_new 2015-08-14 14:47:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pythia # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,26 +16,33 @@ # -%define ver 8201 +%define ver 8210 %define soname lib%{name}8 %define appname Pythia8 Name: pythia -Version: 8.201 +Version: 8.210 Release: 0 Summary: A simulation program for particle collisions at very high energies License: GPL-2.0 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 +# 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 BuildRequires: HepMC-devel +BuildRequires: LHAPDF-devel +BuildRequires: boost-devel +BuildRequires: chrpath +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 +Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets of outgoing particles produced in the interactions between two incoming particles. The objective is to provide as accurate as possible a representation of event properties in a wide range of @@ -54,7 +61,7 @@ Group: Development/Libraries/C and C++ %description -n %{soname} -Pythia can be used to generate high-energy-physics ‘events’, i.e. sets +Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets of outgoing particles produced in the interactions between two incoming particles. The objective is to provide as accurate as possible a representation of event properties in a wide range of @@ -70,14 +77,37 @@ This package provides the shared libraries for %{name}. +%package -n %{soname}lhapdf6 +Summary: A simulation program for particle collisions at very high energies +Group: Development/Libraries/C and C++ + +%description -n %{soname}lhapdf6 +Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets +of outgoing particles produced in the interactions between two +incoming particles. The objective is to provide as accurate as +possible a representation of event properties in a wide range of +reactions, within and beyond the Standard Model, with emphasis on +those where strong interactions play a role, directly or indirectly, +and therefore multihadronic final states are produced. The physics is +then not understood well enough to give an exact description; instead +the program has to be based on a combination of analytical results and +various QCD-based models. Extensive information is provided on all +program elements: subroutines and functions, switches and parameters, +and particle and process data. This should allow the user to tailor +the generation task to the topics of interest. + +This package provides the shared libraries for the lhapdf6 bindings of +%{name}. + %package devel Summary: A simulation program for particle collisions at very high energies Group: Development/Libraries/C and C++ Requires: %{soname} = %{version} +Requires: %{soname}lhapdf6 = %{version} Recommends: %{name}-doc %description devel -Pythia can be used to generate high-energy-physics ‘events’, i.e. sets +Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets of outgoing particles produced in the interactions between two incoming particles. The objective is to provide as accurate as possible a representation of event properties in a wide range of @@ -99,7 +129,7 @@ Group: Documentation/HTML %description doc -Pythia can be used to generate high-energy-physics ‘events’, i.e. sets +Pythia can be used to generate high-energy-physics âeventsâ, i.e. sets of outgoing particles produced in the interactions between two incoming particles. The objective is to provide as accurate as possible a representation of event properties in a wide range of @@ -117,19 +147,25 @@ %prep %setup -q -n %{name}%{ver} +%patch0 -p1 %build # FIX EOF ENCODINGS sed -i 's/\r$//' share/Pythia8/xmldoc/mrstlostarstar.00.dat sed -i 's/\r$//' share/Pythia8/htmldoc/pythia.css -sed -i 's/\r$//' share/Pythia8/examples/softsusy.spc -sed -i 's/\r$//' share/Pythia8/examples/main29.cc +sed -i 's/\r$//' share/Pythia8/phpdoc/pythia.css +sed -i 's/\r$//' examples/main29.cc ./configure \ - --prefix=%{buildroot}%{_prefix} \ - --prefix-lib=%{buildroot}%{_libdir} \ - --prefix-share=%{buildroot}%{_docdir}/%{name} \ - --enable-shared + --prefix=%{_prefix} \ + --prefix-lib=%{_libdir} \ + --prefix-share=%{_docdir}/%{name} \ + --enable-shared \ + --with-lhapdf6 \ + --with-hepmc2 \ + --with-boost \ + --with-gzip \ + --with-fastjet3 # EXPORT PYTHIA8DATA ENV VARIABLE cat << EOF >> %{name}.sh @@ -146,12 +182,15 @@ make %{?_smp_mflags} %install -%make_install +make DESTDIR=%{buildroot} install # REMOVE STATIC LIBRARY rm %{buildroot}%{_libdir}/libpythia8.a -# REMOVE AUTHORS, COPYING, GUIDELINES AND README FILES AND BUNDLE THEM IN MAIN PACKAGE USING %doc +# 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 rm %{buildroot}%{_docdir}/%{name}/${i} @@ -166,15 +205,21 @@ %fdupes -s %{buildroot}%{_docdir}/%{name}/ -%post -n %{soname} -/sbin/ldconfig +%post -n %{soname} -p /sbin/ldconfig + +%postun -n %{soname} -p /sbin/ldconfig + +%post -n %{soname}lhapdf6 -p /sbin/ldconfig -%postun -n %{soname} -/sbin/ldconfig +%postun -n %{soname}lhapdf6 -p /sbin/ldconfig %files -n %{soname} %defattr(-,root,root) -%{_libdir}/*.so +%{_libdir}/%{soname}.so + +%files -n %{soname}lhapdf6 +%defattr(-,root,root) +%{_libdir}/%{soname}lhapdf6.so %files devel %defattr(-,root,root) @@ -192,5 +237,6 @@ %{_docdir}/%{name}/pdfdoc/ %{_docdir}/%{name}/htmldoc/ %{_docdir}/%{name}/examples/ +%{_docdir}/%{name}/outref/ %changelog ++++++ pythia-makefile-destdir-support.patch ++++++ Index: pythia8210/Makefile =================================================================== --- pythia8210.orig/Makefile +++ pythia8210/Makefile @@ -117,12 +117,12 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW # Install (rsync is used for finer control). install: all - mkdir -p $(PREFIX_BIN) $(PREFIX_INCLUDE) $(PREFIX_LIB) $(PREFIX_SHARE) - 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) + 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 + rsync -a $(LOCAL_SHARE)/* $(DESTDIR)/$(PREFIX_SHARE) --exclude .svn + rsync -a $(LOCAL_EXAMPLE) $(DESTDIR)/$(PREFIX_SHARE) --exclude .svn # Clean. clean: ++++++ pythia8201.tgz -> pythia8210.tgz ++++++ /work/SRC/openSUSE:Factory/pythia/pythia8201.tgz /work/SRC/openSUSE:Factory/.pythia.new/pythia8210.tgz differ: char 5, line 1
