[pcl/el6] Updated to release 1.6.0

[rmattes]

commit 4e15087bbdbd245f3a320dd59084da62935c1bcc
Author: Rich Mattes <richmattes at gmail.com>
Date:   Thu Aug 9 23:39:24 2012 -0400

    Updated to release 1.6.0
    
    Conflicts:
    	pcl.spec

 pcl.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/pcl.spec b/pcl.spec
index da689e4..a08779d 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,12 +1,12 @@
 Name:           pcl
-Version:        1.5.1
-Release:        4%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Library for point cloud processing
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://pointclouds.org/
-Source0:        http://dev.pointclouds.org/attachments/download/771/PCL-1.5.1-Source.tar.bz2
+Source0:        http://www.pointclouds.org/assets/files/1.6.0/PCL-1.6.0-Source.tar.bz2
 Patch0:         PCL-1.4.0-Source-fedora.patch
 Patch1:         pcl-1.5.1-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +24,7 @@ BuildRequires:  tetex-latex
 # mandatory
 BuildRequires:  eigen3-devel, flann-devel, cminpack-devel, vtk-devel, gl2ps-devel
 # optional
-BuildRequires:  qhull-devel, libusb1-devel, gtest-devel
+BuildRequires:  qhull-devel, libusb1-devel, gtest-devel qtwebkit-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  openni-devel
 %endif
@@ -74,7 +74,7 @@ Library.
 %prep
 %setup -q -n PCL-%{version}-Source
 %patch0 -p1
-%patch1 -p0
+#%patch1 -p0
 
 # Just to make it obvious we're not using any of these
 rm -rf  3rdparty
@@ -92,7 +92,8 @@ pushd build
   -DCMAKE_SKIP_RPATH=ON \
   ..
 
-make %{?_smp_mflags}
+make 
+#%{?_smp_mflags}
 make doc
 popd
 
@@ -184,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 06 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-1
+- Update to release 1.6.0
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild