[pcl/el6: 46/47] Merge branch 'master' into el6

[Tim Niemueller]

commit 6dcf7789c57f390b6cb98a117b08d14cc332aa60
Merge: b980749 56b4efd
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Thu Sep 18 18:49:23 2014 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	pcl.spec
    	sources

 .gitignore              |    8 +
 pcl-1.7.1-fedora.patch  |   34 ++
 pcl-1.7.1-metslib.patch |   81 ++++
 pcl-vtk6.patch          | 1184 +++++++++++++++++++++++++++++++++++++++++++++++
 pcl.spec                |  140 ++++--
 sources                 |    2 +-
 6 files changed, 1403 insertions(+), 46 deletions(-)
---
diff --cc pcl.spec
index 94c3dcb,4c7e562..c0585f7
--- a/pcl.spec
+++ b/pcl.spec
@@@ -173,26 -165,19 +172,24 @@@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%
  # At the moment fails due to RPATH problem
  # (RPATH not built into test apps as required)
  #%check
- #cd build
- #make test
+ #make -C build test || true
  
 +%clean
 +rm -rf $RPM_BUILD_ROOT
 +
- 
  %post -p /sbin/ldconfig
  
  %postun -p /sbin/ldconfig
  
  
  %files
 +%defattr(-,root,root,-)
  %doc AUTHORS.txt LICENSE.txt
  %{_libdir}/*.so.*
- %{_datadir}/%{name}-1.6
+ %{_datadir}/%{name}-%{apiversion}
  
  %files devel
 +%defattr(-,root,root,-)
  %{_includedir}/*
  %{_libdir}/*.so
  %{_libdir}/pkgconfig/*.pc
@@@ -211,14 -194,59 +208,67 @@@
  
  
  %changelog
- * Tue Oct 16 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-3
+ * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Thu May 22 2014 Petr Machata <pmachata at redhat.com> - 1.7.1-3
+ - Rebuild for boost 1.55.0
+ 
+ * Fri Mar 21 2014 Rich Mattes <richmattes at gmail.com> - 1.7.1-2
+ - Rebuild for new eigen3
+ - Set PCL_ROOT to the CMAKE_INSTALL_PREFIX
+ - Fix usage of VTK_DEFINITIONS (rhbz#1079531)
+ 
+ * Sat Oct 26 2013 Rich Mattes <richmattes at gmail.com> - 1.7.1-1
+ - Update to release 1.7.1
+ 
+ * Sat Sep 14 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-4
+ - Add patch to remove openni-dev from pkgconfig files (rhbz#1007941)
+ - Add patch to generate pcl_geometry pkgconfig file again
+ 
+ * Sun Sep 08 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-3
+ - Fix hard-coded vtk library dependencies in PCLConfig.cmake
+ 
+ * Thu Aug 29 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-2
+ - Fix PCLConfig.cmake so PCL can discover itself
+ 
+ * Wed Aug 21 2013 Rich Mattes <richmattes at gmail.com> - 1.7.0-1
+ - Update to 1.7.0
+ - Update vtk 6 patch for 1.7.0
+ 
+ * Sat Jul 27 2013 pmachata at redhat.com - 1.6.0-7
+ - Rebuild for boost 1.54.0
+ 
+ * Fri Jul 12 2013 Orion Poplawski <orion at cora.nwra.com> - 1.6.0-6
+ - Rebuild for vtk 6.0.0
+ - Add patch for vtk 6 support
+ 
+ * Sat Jun 29 2013 Rich Mattes <richmattes at gmail.com> - 1.6.0-5
+ - Rebuild for new eigen3
+ - Change eigen3 BR to -static
+ - Add ARM support
+ 
+ * 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
+ 
+ * Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.6.0-3
+ - Rebuild for Boost-1.53.0
+ 
++* Tue Oct 16 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-2el6
 +- Remove explicit Requires on openni-devel for non-x86
 +
- * Sun Oct 14 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-2
++* Sun Oct 14 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-2el6
 +- Use cmake28 on el6
 +- Disable openni on el6 for now
 +- Fix documentation generation
 +
  * Tue Sep 25 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-2
  - Disabled march=native flag in PCLConfig.cmake