[sdformat/el6] Declare LIB_INSTALL_DIR relative to CMAKE_INSTALL_PREFIX (rhbz#1057939)
rmattes
rmattes at fedoraproject.org
Tue Mar 4 03:37:24 UTC 2014
commit 07fde3d4b96a278954f4b752179ceb6910eeac8d
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)
Conflicts:
sdformat.spec
sdformat.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/sdformat.spec b/sdformat.spec
index ad32484..6ca32eb 100644
--- a/sdformat.spec
+++ b/sdformat.spec
@@ -3,14 +3,14 @@
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
@@ -61,7 +61,10 @@ rm -rf test/gtest
%build
mkdir build; pushd build
-%cmake28 .. -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_FLAGS_NONE="%{optflags}" -DBoost_NO_BOOST_CMAKE=ON
+%cmake28 .. -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_CXX_FLAGS_NONE="%{optflags}" \
+ -DLIB_INSTALL_DIR:STRING=%{_lib} \
+ -DBoost_NO_BOOST_CMAKE=ON
popd
make -C build %{?_smp_mflags}
make -C build doc
@@ -92,6 +95,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