[pcl] more fixes for archs without openni
Karsten Hopp
karsten at fedoraproject.org
Fri Mar 8 18:11:02 UTC 2013
commit 9cd681810cd0581e667f936715f63ac77e8fdd82
Author: Karsten Hopp <karsten at redhat.com>
Date: Fri Mar 8 19:10:41 2013 +0100
more fixes for archs without openni
pcl.spec | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/pcl.spec b/pcl.spec
index 74ffd55..3106ac3 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,6 +1,6 @@
Name: pcl
Version: 1.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library for point cloud processing
Group: System Environment/Libraries
@@ -42,7 +42,10 @@ Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: eigen3-devel, qhull-devel, openni-devel, cminpack-devel, flann-devel, vtk-devel
+Requires: eigen3-devel, qhull-devel, cminpack-devel, flann-devel, vtk-devel
+%ifarch %{ix86} x86_64
+Requires: openni-devel
+%endif
%description devel
The %{name}-devel package contains libraries and header files for
@@ -131,9 +134,11 @@ popd
mv doc/tutorials/html doc/tutorials/tutorials
for f in $RPM_BUILD_ROOT%{_bindir}/{openni_image,pcd_grabber_viewer,pcd_viewer,openni_viewer,oni_viewer}; do
- mv $f $RPM_BUILD_ROOT%{_bindir}/pcl_$(basename $f)
+ if [ -f $f ]; then
+ mv $f $RPM_BUILD_ROOT%{_bindir}/pcl_$(basename $f)
+ fi
done
-rm $RPM_BUILD_ROOT%{_bindir}/{openni_fast_mesh,openni_ii_normal_estimation,openni_voxel_grid}
+rm $RPM_BUILD_ROOT%{_bindir}/{openni_fast_mesh,openni_ii_normal_estimation,openni_voxel_grid} ||:
mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
mv $RPM_BUILD_ROOT%{_datadir}/%{name}-*/*.cmake $RPM_BUILD_ROOT%{_libdir}/cmake/pcl
@@ -188,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Mar 08 2013 Karsten Hopp <karsten at redhat.com> 1.6.0-4
+- more fixes for archs without openni
+
* Sun Feb 17 2013 Rich Mattes <richmattes at gmail.com> - 1.6.0-3
- Fixed bogus changelog dates
- Fixed build errors due to boost 1.53 and/or gcc 4.8
More information about the scm-commits
mailing list