Hello community,
here is the log from the commit of package Rivet for openSUSE:Factory checked
in at 2014-06-24 22:46:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-29
17:36:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes 2014-06-24
22:46:27.000000000 +0200
@@ -1,0 +2,16 @@
+Sat Jun 21 22:16:44 UTC 2014 - badshah...@gmail.com
+
+- Update to version 2.1.2:
+ + Lots of changes since previous version (2.0.0), see
+ ChangeLog file in /usr/share/doc/packages/Rivet-devel/ for a
+ full list
+- Packaging changes:
+ + Add Rivet-compatibility-with-old-boost.patch: fix foreach
+ compatibility with boost < 1.50 and make Rivet build with
+ openSUSE 12.3 again
+ + Now requires YODA-devel >= 1.0.6 for building
+ + Package new pkgconfig file (.pc file manually stripped of
+ rpaths to avoid linking issues, and an rpmlint warning)
+ + Also strip rpath from rivet-config script.
+
+-------------------------------------------------------------------
Old:
----
Rivet-2.0.0.tar.bz2
New:
----
Rivet-2.1.2.tar.bz2
Rivet-compatibility-with-old-boost.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Rivet.spec ++++++
--- /var/tmp/diff_new_pack.j5OPnH/_old 2014-06-24 22:46:28.000000000 +0200
+++ /var/tmp/diff_new_pack.j5OPnH/_new 2014-06-24 22:46:28.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package Rivet
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,17 @@
%define so_name lib%{name}
Name: Rivet
-Version: 2.0.0
+Version: 2.1.2
Release: 0
Summary: A toolkit for validation of Monte Carlo event generators
License: GPL-2.0
Group: Development/Libraries/C and C++
Url: http://rivet.hepforge.org/
Source:
http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM Rivet-compatibility-with-old-boost.patch
badshah...@gmail.com -- Fix foreach compatibility with boost < 1.50 and make
Rivet build with openSUSE 12.3 again
+Patch0: Rivet-compatibility-with-old-boost.patch
BuildRequires: HepMC-devel
-BuildRequires: YODA-devel
+BuildRequires: YODA-devel >= 1.0.6
BuildRequires: boost-devel
BuildRequires: doxygen
BuildRequires: fastjet-devel
@@ -103,6 +105,13 @@
%
%prep
%setup -q
+%patch0 -p1
+
+# REMOVE EXISTING rivet.pc FILE, ALLOW make TO GENERATE rivet.pc FROM
rivet.pc.in
+rm -f rivet.pc
+
+# REMOVE INCORRECT LIBDIRS FROM .pc.in FILE (the right libdirs are already
present)
+sed -i "s| -L@GSLLIBPATH@||g" rivet.pc.in
%build
%configure --docdir=%{_docdir}/%{name}/
@@ -114,6 +123,10 @@
# Remove traces of BUILDROOT from files
sed -i "s|%{buildroot}||g" %{buildroot}%{python_sitearch}/rivet/*.pyc
+# MANUALLY REMOVE rpath FROM PKGCONFIG FILE AND rivet-config SCRIPT
+sed -i "s|-Wl,-rpath,||g" %{buildroot}%{_libdir}/pkgconfig/rivet.pc
+sed -i "s|-Wl,-rpath,||g" %{buildroot}%{_bindir}/rivet-config
+
find %{buildroot}%{_libdir}/ -name "*.la" -delete
%post -n %{so_name} -p /sbin/ldconfig
@@ -131,6 +144,7 @@
%{_bindir}/rivet-buildplugin
%{_includedir}/%{name}/
%{_datadir}/%{name}/
+%{_libdir}/pkgconfig/rivet.pc
%files -n python-%{name}
%defattr(-,root,root)
++++++ Rivet-2.0.0.tar.bz2 -> Rivet-2.1.2.tar.bz2 ++++++
++++ 142874 lines of diff (skipped)
++++++ Rivet-compatibility-with-old-boost.patch ++++++
Index: Rivet-2.1.2/include/Rivet/Tools/RivetBoost.hh
===================================================================
--- Rivet-2.1.2.orig/include/Rivet/Tools/RivetBoost.hh
+++ Rivet-2.1.2/include/Rivet/Tools/RivetBoost.hh
@@ -10,10 +10,13 @@
#include "boost/utility.hpp"
#include "boost/foreach.hpp"
+#include "boost/version.hpp"
#ifndef foreach
namespace boost {
// Suggested work-around for https://svn.boost.org/trac/boost/ticket/6131
+ #if BOOST_VERSION != 104900
namespace BOOST_FOREACH = foreach;
+ #endif
}
#define foreach BOOST_FOREACH
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
