From 242d67530d9530b6b2e92929f96953ebfc8389f5 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Aug 05 2020 01:02:29 +0000
Subject: Update to release 1.0.4


---

diff --git a/.gitignore b/.gitignore
index 01775f5..0c59f10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /urdfdom-0.4.2-be20424.tar.gz
 /urdfdom-1.0.0-be20424.tar.gz
 /urdfdom-1.0.0.tar.gz
+/urdfdom-1.0.4.tar.gz
diff --git a/sources b/sources
index ac68534..c911e97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (urdfdom-1.0.0.tar.gz) = 50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f
+SHA512 (urdfdom-1.0.4.tar.gz) = 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
diff --git a/urdfdom-1.0.4-console-bridge.patch b/urdfdom-1.0.4-console-bridge.patch
new file mode 100644
index 0000000..bb1fd13
--- /dev/null
+++ b/urdfdom-1.0.4-console-bridge.patch
@@ -0,0 +1,12 @@
+diff -up ./CMakeLists.txt.console-bridge ./CMakeLists.txt
+--- ./CMakeLists.txt.console-bridge	2020-08-04 20:40:25.998492153 -0400
++++ ./CMakeLists.txt	2020-08-04 20:40:53.368291778 -0400
+@@ -41,7 +41,7 @@ if (NOT MSVC)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ 
+-find_package(console_bridge 0.3 REQUIRED)
++find_package(console_bridge REQUIRED)
+ include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
+ link_directories(${console_bridge_LIBRARY_DIRS})
+ 
diff --git a/urdfdom.spec b/urdfdom.spec
index 5247517..f908ba0 100644
--- a/urdfdom.spec
+++ b/urdfdom.spec
@@ -1,11 +1,17 @@
+%undefine __cmake_in_source_build
+%global libversion 1.0
+
 Name:		urdfdom
-Version:	1.0.0
-Release:	6%{?dist}
+Version:	1.0.4
+Release:	1%{?dist}
 Summary:	U-Robot Description Format Document Object Model
 
 License:	BSD
 URL:		http://ros.org/wiki/urdf
 Source0:	https://github.com/ros/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+# Don't look for a specific version of console-bridge
+# https://github.com/ros/urdfdom/pull/141
+Patch0:     urdfdom-1.0.4-console-bridge.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:	boost-devel
@@ -30,24 +36,23 @@ developing applications that use %{name}.
 
 %prep
 %setup -qn %{name}-%{version}
+%patch0 -p0 -b .console-bridge
 # Disable automatic installation of python bindings
 sed -i 's/add_subdirectory(urdf_parser_py)//' CMakeLists.txt
 
 %build
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=%{_lib}
+%cmake -DCMAKE_BUILD_TYPE=Release
 %cmake_build
 
-
 %install
 %cmake_install
 rm -rf %{buildroot}%{_bindir}/urdf_mem_test
 
-%ldconfig_scriptlets
 
 %files
 %license LICENSE
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/*.so.%{libversion}
 
 %files devel
 %{_libdir}/*.so
@@ -56,6 +61,9 @@ rm -rf %{buildroot}%{_bindir}/urdf_mem_test
 %{_includedir}/urdf_parser
 
 %changelog
+* Tue Aug 04 2020 Rich Mattes <richmattes@gmail.com> - 1.0.4-1
+- Update to release 1.0.4
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild