[mrpt/f18] Updated tarball script and disabled more cmake features
rmattes
rmattes at fedoraproject.org
Wed Aug 29 04:20:26 UTC 2012
commit 2f88da6f4b8a3de75b7d5569bc2142a38ce18377
Author: Rich Mattes <richmattes at gmail.com>
Date: Sun Aug 26 16:10:30 2012 -0400
Updated tarball script and disabled more cmake features
.gitignore | 1 +
create_tarball_mrpt.sh | 4 ++--
mrpt.spec | 12 +++++++-----
sources | 2 +-
4 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be85caa..23effd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ mrpt-0.9.0-20100606svn1885.tar.bz2
/mrpt-0.9.5-20110916svn2655.tar.gz
/mrpt-0.9.5-20110917svn2662.tar.gz
/mrpt-0.9.6-free.tar.bz2
+/mrpt-0.9.6-fedora.tar.bz2
diff --git a/create_tarball_mrpt.sh b/create_tarball_mrpt.sh
index c304c39..fdd6f99 100644
--- a/create_tarball_mrpt.sh
+++ b/create_tarball_mrpt.sh
@@ -1,6 +1,6 @@
tar xvf mrpt-0.9.6.tar.gz
-rm -rf mrpt-0.9.6/hwdrivers/src/{xSens,aria,libfreenect}
+rm -rf mrpt-0.9.6/libs/hwdrivers/src/{xSens,aria,libfreenect}
rm -rf mrpt-0.9.6/kinect-win32-driver
rm -rf mrpt-0.9.6/otherlibs/eigen3
-tar cjf mrpt-0.9.6-free.tar.bz2 mrpt-0.9.6
+tar cjf mrpt-0.9.6-fedora.tar.bz2 mrpt-0.9.6
rm -rf mrpt-0.9.6/
diff --git a/mrpt.spec b/mrpt.spec
index 0ec86cc..9c622ce 100644
--- a/mrpt.spec
+++ b/mrpt.spec
@@ -20,7 +20,7 @@ URL: http://www.mrpt.org/
#Source downloaded from:
#http://downloads.sourceforge.net/%{name}/MRPT-all/MRPT-0.9.6/%{name}-%{version}.tar.gz
# Then create_tarball_mrpt.sh was run to generate:
-Source0: %{name}-%{version}-free.tar.bz2
+Source0: %{name}-%{version}-fedora.tar.bz2
Source1: create_tarball_%{name}.sh
#Fixes build issues related to gcc 4.7
Patch0: mrpt-0.9.5.gcc47.patch
@@ -288,14 +288,16 @@ with Doxygen.
# The flag CMAKE_MRPT_IS_RPM_PACKAGE disables global "-mtune=native"
mkdir build
cd build
-%cmake -DCMAKE_MRPT_IS_RPM_PACKAGE=1 \
+%cmake \
+ -DCMAKE_MRPT_IS_RPM_PACKAGE=1 \
-DMRPT_ENABLE_LIBSTD_PARALLEL_MODE=ON \
- -DDISABLE_SSE3=IN \
+ -DMRPT_ENABLE_PRECOMPILED_HEADERS=OFF \
+ -DDISABLE_SSE3=ON \
%ifnarch x86_64
- -DDISABLE_SSE2=OFF \
+ -DDISABLE_SSE2=ON \
%endif
-DMRPT_OPTIMIZE_NATIVE=OFF \
- -DCMAKE_BUILD_TYPE=NONE \
+ -DCMAKE_BUILD_TYPE=Debug \
-DEIGEN_USE_EMBEDDED_VERSION=OFF \
-DBUILD_KINECT=OFF \
-DBUILD_ARIA=OFF \
diff --git a/sources b/sources
index 6bd1536..a09eb03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-baad4ce08c79328d6497a76109902431 mrpt-0.9.6-free.tar.bz2
+67e52865ad0058bec370d5da7de51148 mrpt-0.9.6-fedora.tar.bz2
More information about the scm-commits
mailing list