Hello community, here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2015-06-30 10:17:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Rivet (Old) and /work/SRC/openSUSE:Factory/.Rivet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet" Changes: -------- --- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2014-10-29 21:10:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes 2015-06-30 10:17:45.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 25 05:45:33 UTC 2015 - [email protected] + +- Add Rivet-boost-configure-for-GCC5.patch to fix autoconf + boost macros lookup with GCC5; patch taken from boost.m4 + upstream [https://github.com/tsuna/boost.m4]. + +------------------------------------------------------------------- New: ---- Rivet-boost-configure-for-GCC5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Rivet.spec ++++++ --- /var/tmp/diff_new_pack.DJbwg2/_old 2015-06-30 10:17:45.000000000 +0200 +++ /var/tmp/diff_new_pack.DJbwg2/_new 2015-06-30 10:17:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Rivet # -# 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 @@ -30,14 +30,19 @@ Patch0: Rivet-compatibility-with-old-boost.patch # PATCH-FIX-UPSTREAM 0001-fix_YODA_Histo1D_includes.patch [email protected] -- Fix buildfailure in MathHeader.hh by updating for YODA changing from mean and stdDev to xMean and xStdDev Patch1: 0001-fix_YODA_Histo1D_includes.patch +# PATCH-FIX-UPSTREAM Rivet-boost-configure-for-GCC5.patch [email protected] -- Fix autoconf's boost lookup with GCC5; patch taken from boost.m4 upstream +Patch2: Rivet-boost-configure-for-GCC5.patch BuildRequires: HepMC-devel BuildRequires: YODA-devel >= 1.0.6 +BuildRequires: autoconf +BuildRequires: automake BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: fastjet-devel BuildRequires: fastjet-plugin-siscone-devel BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: texlive-latex-bin @@ -110,6 +115,10 @@ %setup -q %patch0 -p1 %patch1 -p1 +# GCC5 used only for openSUSE > 13.2 +%if 0%{?suse_version} > 1320 +%patch2 -p1 +%endif # REMOVE EXISTING rivet.pc FILE, ALLOW make TO GENERATE rivet.pc FROM rivet.pc.in rm -f rivet.pc @@ -118,6 +127,10 @@ sed -i "s| -L@GSLLIBPATH@||g" rivet.pc.in %build +# GCC5 used only for openSUSE > 13.2 +%if 0%{?suse_version} > 1320 +autoreconf -i +%endif %configure --docdir=%{_docdir}/%{name}/ make %{?_smp_mflags} ++++++ Rivet-boost-configure-for-GCC5.patch ++++++ ++++ 824 lines (skipped)
