[urdfdom] Update to release 0.3.0
rmattes
rmattes at fedoraproject.org
Thu Apr 17 00:53:13 UTC 2014
commit 8abb0af791758862f04657f8651753ef68907c9b
Author: Rich Mattes <richmattes at gmail.com>
Date: Wed Apr 16 20:52:59 2014 -0400
Update to release 0.3.0
.gitignore | 1 +
sources | 2 +-
urdfdom-0.3.0-soname.patch | 40 ++++++++++++++++++++++++++++++++++++++++
urdfdom.spec | 21 +++++++++++++++++----
4 files changed, 59 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16a6d72..575feb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/urdfdom-0.2.8-99671a1.tar.gz
/urdfdom-0.2.9-e0836e0.tar.gz
+/urdfdom-0.3.0-64084cd.tar.gz
diff --git a/sources b/sources
index f9841b3..4efa673 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2a3f8bfebd752e880fdf88621d1c767 urdfdom-0.2.9-e0836e0.tar.gz
+219a38b14c5f9cda07ff447aae5fa973 urdfdom-0.3.0-64084cd.tar.gz
diff --git a/urdfdom-0.3.0-soname.patch b/urdfdom-0.3.0-soname.patch
new file mode 100644
index 0000000..20aeaed
--- /dev/null
+++ b/urdfdom-0.3.0-soname.patch
@@ -0,0 +1,40 @@
+From e35d6f6156c6aa04ab6639ec57f49616b12b731a Mon Sep 17 00:00:00 2001
+From: Jose Luis Rivero <jrivero at osrfoundation.org>
+Date: Mon, 24 Mar 2014 21:34:46 +0100
+Subject: [PATCH] Fix soname versions
+
+---
+ urdf_parser/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
+index cd23331..7ce2429 100644
+--- a/urdf_parser/CMakeLists.txt
++++ b/urdf_parser/CMakeLists.txt
+@@ -2,19 +2,19 @@ include_directories(include)
+
+ add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp)
+ target_link_libraries(urdfdom_world ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
+-set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.3)
+
+ add_library(urdfdom_model SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp)
+ target_link_libraries(urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
+-set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.3)
+
+ add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp)
+ target_link_libraries(urdfdom_sensor urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
+-set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.3)
+
+ add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp)
+ target_link_libraries(urdfdom_model_state ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
+-set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.2)
++set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.3)
+
+ # --------------------------------
+
+--
+1.9.1
+
diff --git a/urdfdom.spec b/urdfdom.spec
index f7aa57c..63b0a70 100644
--- a/urdfdom.spec
+++ b/urdfdom.spec
@@ -1,9 +1,9 @@
-%global commit e0836e052aad7f58d958459cfbcbff87826f0e45
+%global commit 64084cd5fdc2a212bfed4ae914a8c4698a49cb39
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: urdfdom
-Version: 0.2.9
-Release: 2%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Summary: U-Robot Description Format Document Object Model
Group: Development/Libraries
@@ -11,9 +11,15 @@ License: BSD
URL: http://ros.org/wiki/urdf
Source0: https://github.com/ros/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+# Sonames, how do they work?
+# https://github.com/ros/urdfdom/commit/892ab9b7d4bde5d84624c14fa7d82afe041948b9.patch
+Patch0: %{name}-0.3.0-soname.patch
+# Install to correct libdir, not submitted upstream
+Patch1: %{name}-0.3.0-fedora.patch
+
BuildRequires: boost-devel
BuildRequires: cmake
-BuildRequires: urdfdom-headers-devel
+BuildRequires: urdfdom-headers-static >= 0.3
BuildRequires: console-bridge-devel
BuildRequires: tinyxml-devel
@@ -25,6 +31,7 @@ for populating the class data structures from an URDF file
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: urdfdom-headers-devel >= 0.3
%description devel
The %{name}-devel package contains libraries and header files for
@@ -32,6 +39,8 @@ developing applications that use %{name}.
%prep
%setup -qn %{name}-%{commit}
+%patch0 -p1 -b .soname
+%patch1 -p0 -b .fedora
# Disable automatic installation of python bindings
sed -i 's/add_subdirectory(urdf_parser_py)//' CMakeLists.txt
@@ -42,6 +51,7 @@ make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
+rm -rf %{buildroot}%{_bindir}/urdf_mem_test
%post -p /sbin/ldconfig
@@ -59,6 +69,9 @@ make install DESTDIR=%{buildroot}
%{_includedir}/urdf_parser
%changelog
+* Wed Apr 16 2014 Rich Mattes <richmattes at gmail.com> - 0.3.0-1
+- Update to release 0.3.0
+
* Sun Feb 09 2014 Rich Mattes <richmattes at gmail.com> - 0.2.9-2
- Rebuild for console-bridge 0.2.5
More information about the scm-commits
mailing list