From 2b5c1443501ddb4e5bbe4fc194525c0314cd0f83 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Jan 09 2016 02:16:56 +0000 Subject: Update to release 6.5.1 (rhbz#1247414) --- diff --git a/.gitignore b/.gitignore index 20cffd8..90fe8e1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /gazebo-3.1.0.tar.bz2 /gazebo-4.0.2.tar.bz2 /gazebo-5.1.0.tar.bz2 +/gazebo-6.5.1.tar.bz2 diff --git a/gazebo.spec b/gazebo.spec index c33d66e..df0cc03 100644 --- a/gazebo.spec +++ b/gazebo.spec @@ -1,8 +1,8 @@ -%global abiversion 5.1 +%global abiversion 6.5 Name: gazebo -Version: 5.1.0 -Release: 8%{?dist} +Version: 6.5.1 +Release: 1%{?dist} Summary: 3D multi-robot simulator with dynamics License: ASL 2.0 and BSD @@ -13,21 +13,20 @@ Source1: gazebo.desktop # path to find ogre. It also fixes a problem with avformat and avcodec # not being found when ffmpeg is, and fixes the freeimage pkg-config # version being used -Patch0: %{name}-5.0.1-fedora.patch +Patch0: %{name}-6.5.1-fedora.patch # Remove rpath in pkgconfig files # Not submitted upstream Patch2: %{name}-4.0.2-rpath.patch # Fix an exception that differs in behaviour because of boost differences # Not submitted upstream Patch3: %{name}-2.2.2-connection.patch -# Fix invalid use of boost::function with rvalue argument. -Patch4: %{name}-boost-1.58.patch # Gazebo requires tbb, which is not available on s390(x) ExcludeArch: s390 s390x BuildRequires: PyOpenGL BuildRequires: boost-devel +BuildRequires: bullet-devel BuildRequires: cmake BuildRequires: console-bridge-devel BuildRequires: desktop-file-utils @@ -44,6 +43,7 @@ BuildRequires: libtar-devel BuildRequires: libtool-ltdl-devel BuildRequires: libXext-devel BuildRequires: libxml2-devel +BuildRequires: ignition-math-devel BuildRequires: ogre-devel BuildRequires: openal-soft-devel BuildRequires: protobuf-devel @@ -148,7 +148,6 @@ Development documentation for %{name} %patch0 -p0 -b .fedora %patch2 -p0 -b .rpath %patch3 -p0 -b .connection -%patch4 -p1 -b .boost # These are either unused, or replaced by system versions rm -rf deps/ann @@ -224,6 +223,8 @@ rm -f %{buildroot}/%{_libdir}/libgazebo_player.so rm -f %{buildroot}/%{_libdir}/libgazebo_player.so.? mv %{buildroot}/%{_libdir}/libgazebo_player.so.%{version} %{buildroot}%{_libdir}/player/libgazebo_player.so +rm -f %{buildroot}/%{_libdir}/*.a + %check # Tests run for informational purposes only pushd build @@ -315,6 +316,7 @@ fi %files devel %{_datadir}/%{name}-%{abiversion}/examples/plugins +%{_datadir}/%{name}-%{abiversion}/examples/ignition %{_datadir}/%{name}-%{abiversion}/examples/stand_alone %{_libdir}/*.so %exclude %{_includedir}/%{name}-%{abiversion}/%{name}/ode @@ -324,6 +326,9 @@ fi %{_libdir}/cmake %changelog +* Mon Jan 04 2016 Rich Mattes - 6.5.1-1 +- Update to release 6.5.1 (rhbz#1247414) + * Sat Oct 17 2015 Kalev Lember - 5.1.0-8 - Rebuilt for libgeos soname bump diff --git a/sources b/sources index 580ccb1..daa4300 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc74089cf335d7f7f3e580815f251590 gazebo-5.1.0.tar.bz2 +597b2a76ca38a54429234b0ca1b1feec gazebo-6.5.1.tar.bz2