[rpms/pcl] f44: Merge branch 'master' of ssh://pkgs.fedoraproject.org/pcl

[rpms/pcl] f44: Merge branch 'master' of ssh://pkgs.fedoraproject.org/pcl

[Rich Mattes]

            A new commit has been pushed.

            Repo   : rpms/pcl
            Branch : f44
            Commit : 71867dd27765d07c369a9afcafc4ae2b124d1b0d
            Author : Rich Mattes <richmattes@gmail.com>
            Date   : 2012-08-14T19:03:50-04:00
            Stats  : +12/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/pcl/c/71867dd27765d07c369a9afcafc4ae2b124d1b0d?branch=f44

            Log:
            Merge branch 'master' of ssh://pkgs.fedoraproject.org/pcl

Conflicts:
	pcl.spec

---
diff --git a/pcl.spec b/pcl.spec
index 7d366f6..8711367 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -92,8 +92,7 @@ pushd build
   -DCMAKE_SKIP_RPATH=ON \
   ..
 
-make 
-#%{?_smp_mflags}
+make %{?_smp_mflags}
 make doc
 popd
 
@@ -188,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Aug 06 2012 Rich Mattes <richmattes@gmail.com> - 1.6.0-1
 - Update to release 1.6.0
 
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Fri May 25 2012 Rich Mattes <richmattes@gmail.com> - 1.5.1-3
 - Rebuild for new vtk
 

diff --git a/pcl.spec b/pcl.spec
index da689e4..8711367 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
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 06 2012 Rich Mattes <richmattes@gmail.com> - 1.6.0-1
+- Update to release 1.6.0
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild