[sdformat] Declare LIB_INSTALL_DIR relative to CMAKE_INSTALL_PREFIX (rhbz#1057939)
rmattes
rmattes at fedoraproject.org
Sun Jan 26 18:42:37 UTC 2014
commit 842fc5aef0205c388c36c65da4ed5bf161e337d0
Author: Rich Mattes <richmattes at gmail.com>
Date: Sun Jan 26 13:42:52 2014 -0500
Declare LIB_INSTALL_DIR relative to CMAKE_INSTALL_PREFIX (rhbz#1057939)
sdformat.spec | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/sdformat.spec b/sdformat.spec
index 966ea5b..5f057ea 100644
--- a/sdformat.spec
+++ b/sdformat.spec
@@ -3,18 +3,19 @@
Name: sdformat
Version: 1.4.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Simulation Description Format
License: ASL 2.0
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.
-# Not yet submitted upstream
+# Work progressing upstream
Patch0: sdformat-1.4.10-urdfdom.patch
# Automatically discovers and uses system gtest if available.
# Not yet submitted upstream
Patch1: sdformat-1.4.10-gtest.patch
+
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: doxygen-latex
@@ -57,7 +58,7 @@ rm -rf test/gtest
%build
mkdir build; pushd build
-%cmake .. -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_FLAGS_NONE="%{optflags}"
+%cmake .. -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_FLAGS_NONE="%{optflags}" -DLIB_INSTALL_DIR:STRING=%{_lib}
popd
make -C build %{?_smp_mflags}
make -C build doc
@@ -88,6 +89,9 @@ make -C build test || exit 0
%doc build/doxygen/html
%changelog
+* 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)
+
* Wed Nov 27 2013 Rich Mattes <richmattes at gmail.com> - 1.4.11-1
- Update to release 1.4.11
More information about the scm-commits
mailing list