[sdformat/el6] Update to release 2.0.0

rmattes rmattes at fedoraproject.org
Sun May 18 16:15:34 UTC 2014


commit 28bf6a537d7a97fd61f45f57ec7f4fcb0950544e
Author: Rich Mattes <richmattes at gmail.com>
Date:   Tue Apr 15 19:32:40 2014 -0400

    Update to release 2.0.0
    
    Conflicts:
    	sdformat.spec

 .gitignore    |    1 +
 sdformat.spec |   14 +++++++++-----
 sources       |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be4664f..8131b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sdformat_1.4.10.tar.bz2
 /sdformat_1.4.11.tar.bz2
+/sdformat_2.0.0.tar.bz2
diff --git a/sdformat.spec b/sdformat.spec
index 6ca32eb..c34e9b1 100644
--- a/sdformat.spec
+++ b/sdformat.spec
@@ -1,9 +1,9 @@
-%global hghash 8e386fc1f1c6 
-%global apiver 1.4
+%global hghash a5ee0244239d
+%global apiver 2.0
 
 Name:		sdformat
-Version:	1.4.11
-Release:	2%{?dist}
+Version:	2.0.0
+Release:	1%{?dist}
 Summary:	The Simulation Description Format
 
 License:	ASL 2.0
@@ -11,7 +11,7 @@ URL:		http://gazebosim.org/sdf.html
 Source0:	https://bitbucket.org/osrf/%{name}/get/%{name}_%{version}.tar.bz2
 # Unbundle urdfdom and urdfdom-headers from sdformat, build against system versions.
 # Work progressing upstream
-Patch0:		sdformat-1.4.10-urdfdom.patch
+Patch0:		sdformat-2.0.0-urdfdom.patch
 # Automatically discovers and uses system gtest if available.
 # Not yet submitted upstream
 Patch1:		sdformat-1.4.10-gtest.patch
@@ -64,6 +64,7 @@ mkdir build; pushd build
 %cmake28 .. -DCMAKE_BUILD_TYPE=None \
   -DCMAKE_CXX_FLAGS_NONE="%{optflags}"  \
   -DLIB_INSTALL_DIR:STRING=%{_lib} \
+  -DUSE_EXTERNAL_URDF=ON \
   -DBoost_NO_BOOST_CMAKE=ON
 popd
 make -C build %{?_smp_mflags}
@@ -95,6 +96,9 @@ make -C build test || exit 0
 %doc build/doxygen/html
 
 %changelog
+* Tue Apr 15 2014 Rich Mattes <richmattes at gmail.com> - 2.0.0-1
+- Update to release 2.0
+
 * Sun Jan 26 2014 Rich Mattes <richmattes at gmail.com> - 1.4.11-2
 - Declare LIB_INSTALL_DIR relative to CMAKE_INSTALL_PREFIX (rhbz#1057939)
 
diff --git a/sources b/sources
index 01814d2..fcc3342 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-693363e07cce8e94c75318d1215b0db8  sdformat_1.4.11.tar.bz2
+d3b98b2296f3f234019c551af6a27bf9  sdformat_2.0.0.tar.bz2


More information about the scm-commits mailing list