[urdfdom] Update to release 0.2.9

rmattes rmattes at fedoraproject.org
Sat Oct 19 22:19:47 UTC 2013


commit 50bda62ec2cdc8f7f5a62575df86e432a1f0ea8f
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Oct 19 18:19:48 2013 -0400

    Update to release 0.2.9
    
    - Remove upstreamed patches

 .gitignore                 |    1 +
 sources                    |    2 +-
 urdfdom-0.2.7-libdir.patch |   61 --------------------------------------------
 urdfdom-0.2.8-soname.patch |   36 --------------------------
 urdfdom.spec               |   23 +++++++---------
 5 files changed, 12 insertions(+), 111 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b23d70..16a6d72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /urdfdom-0.2.8-99671a1.tar.gz
+/urdfdom-0.2.9-e0836e0.tar.gz
diff --git a/sources b/sources
index 79fa07d..f9841b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4c7b147b3f997328e7abce136b53645  urdfdom-0.2.8-99671a1.tar.gz
+a2a3f8bfebd752e880fdf88621d1c767  urdfdom-0.2.9-e0836e0.tar.gz
diff --git a/urdfdom.spec b/urdfdom.spec
index 330604c..2d09411 100644
--- a/urdfdom.spec
+++ b/urdfdom.spec
@@ -1,9 +1,9 @@
-%global commit 99671a12b4c6794341bc6f71ce0cf08448cace68
+%global commit e0836e052aad7f58d958459cfbcbff87826f0e45
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		urdfdom
-Version:	0.2.8
-Release:	2%{?dist}
+Version:	0.2.9
+Release:	1%{?dist}
 Summary:	U-Robot Description Format Document Object Model
 
 Group:		Development/Libraries
@@ -11,11 +11,6 @@ License:	BSD
 URL:		http://ros.org/wiki/urdf
 Source0:	https://github.com/ros/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 
-# Allow for installing libraries into /usr/lib64 on 64 bit systems
-Patch0:		%{name}-0.2.7-libdir.patch
-# Add SONAME to all libraries
-# Taken from https://github.com/ros/urdfdom/commit/6295b5bdfcbca13a8842d1912f9c5dbe4b1769e5.patch
-Patch1:		%{name}-0.2.8-soname.patch
 BuildRequires:	boost-devel
 BuildRequires:	cmake
 BuildRequires:	urdfdom-headers-devel
@@ -37,18 +32,16 @@ developing applications that use %{name}.
 
 %prep
 %setup -qn %{name}-%{commit}
-%patch0 -p0 -b .libdir
-%patch1 -p1
+# Disable automatic installation of python bindings
+sed -i 's/add_subdirectory(urdf_parser_py)//' CMakeLists.txt
 
 %build
-%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
+%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=%{_lib }
 make %{?_smp_mflags}
 
 
 %install
 make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}%{_datadir}/%{name}/{urdf_mem_test,check_urdf,urdf_to_graphiz} %{buildroot}%{_bindir}
 
 %post -p /sbin/ldconfig
 
@@ -66,6 +59,10 @@ mv %{buildroot}%{_datadir}/%{name}/{urdf_mem_test,check_urdf,urdf_to_graphiz} %{
 %{_includedir}/urdf_parser
 
 %changelog
+* Sat Oct 19 2013 Rich Mattes <richmattes at gmail.com> - 0.2.9-1
+- Update to release 0.2.9
+- Remove upstreamed patches
+
 * Wed Aug 21 2013 Rich Mattes <richmattes at gmail.com> - 0.2.8-2
 - Backport upstream SONAME patch
 - Add ldconfig post and postun


More information about the scm-commits mailing list