[rpms/pcl] f44: Update patch to fix PCLConfig.cmake

[rpms/pcl] f44: Update patch to fix PCLConfig.cmake

[Tim Niemueller]

            A new commit has been pushed.

            Repo   : rpms/pcl
            Branch : f44
            Commit : b660a5bd548129b1e427adb12cd5401fe3bf28e7
            Author : Tim Niemueller <niemueller@kbsg.rwth-aachen.de>
            Date   : 2012-01-17T00:34:43+01:00
            Stats  : +32/-11 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/pcl/c/b660a5bd548129b1e427adb12cd5401fe3bf28e7?branch=f44

            Log:
            Update patch to fix PCLConfig.cmake

Since the original PCLConfig.make expects the file to be in
/usr/share/cmake but we install it in /usr/lib(64)/cmake/pcl the way
PCL_ROOT was generated was wrong. Added a little heuristic which makes
it work for us and which should be upstreamable.

---
diff --git a/PCL-1.3.1-Source-fedora.patch b/PCL-1.3.1-Source-fedora.patch
index 1f48044..ebe893d 100644
--- a/PCL-1.3.1-Source-fedora.patch
+++ b/PCL-1.3.1-Source-fedora.patch
@@ -1,6 +1,6 @@
-diff -urN PCL-1.3.1-Source/cmake/pcl_targets.cmake PCL-1.3.1-Source-fedora/cmake/pcl_targets.cmake
+diff -urN PCL-1.3.1-Source/cmake/pcl_targets.cmake PCL-1.3.1-Source.fedora/cmake/pcl_targets.cmake
 --- PCL-1.3.1-Source/cmake/pcl_targets.cmake	2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source-fedora/cmake/pcl_targets.cmake	2011-12-04 12:37:45.827377186 +0100
++++ PCL-1.3.1-Source.fedora/cmake/pcl_targets.cmake	2012-01-16 19:40:43.433690172 +0100
 @@ -1,5 +1,7 @@
  include(${PROJECT_SOURCE_DIR}/cmake/pcl_utils.cmake)
  
@@ -26,9 +26,9 @@ diff -urN PCL-1.3.1-Source/cmake/pcl_targets.cmake PCL-1.3.1-Source-fedora/cmake
      configure_file(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake.in ${_pc_file}
          @ONLY)
      install(FILES ${_pc_file} DESTINATION ${PKGCFG_INSTALL_DIR}
-diff -urN PCL-1.3.1-Source/cmake/pcl_utils.cmake PCL-1.3.1-Source-fedora/cmake/pcl_utils.cmake
+diff -urN PCL-1.3.1-Source/cmake/pcl_utils.cmake PCL-1.3.1-Source.fedora/cmake/pcl_utils.cmake
 --- PCL-1.3.1-Source/cmake/pcl_utils.cmake	2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source-fedora/cmake/pcl_utils.cmake	2011-12-04 12:25:43.779363356 +0100
++++ PCL-1.3.1-Source.fedora/cmake/pcl_utils.cmake	2012-01-16 19:40:43.434690169 +0100
 @@ -81,7 +81,7 @@
  # subdirectory named after the library in question (e.g.
  # "registration/blorgle.h")
@@ -38,9 +38,9 @@ diff -urN PCL-1.3.1-Source/cmake/pcl_utils.cmake PCL-1.3.1-Source-fedora/cmake/p
      set(INCLUDE_INSTALL_ROOT
          "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
      set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
-diff -urN PCL-1.3.1-Source/CMakeLists.txt PCL-1.3.1-Source-fedora/CMakeLists.txt
+diff -urN PCL-1.3.1-Source/CMakeLists.txt PCL-1.3.1-Source.fedora/CMakeLists.txt
 --- PCL-1.3.1-Source/CMakeLists.txt	2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source-fedora/CMakeLists.txt	2011-12-04 12:25:43.780363354 +0100
++++ PCL-1.3.1-Source.fedora/CMakeLists.txt	2012-01-16 19:40:43.435690166 +0100
 @@ -96,11 +96,11 @@
  ###
  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
@@ -56,9 +56,9 @@ diff -urN PCL-1.3.1-Source/CMakeLists.txt PCL-1.3.1-Source-fedora/CMakeLists.txt
  ENDIF("${is_system_dir}" STREQUAL "-1")
  
  ### ---[ Find universal dependencies
-diff -urN PCL-1.3.1-Source/io/CMakeLists.txt PCL-1.3.1-Source-fedora/io/CMakeLists.txt
+diff -urN PCL-1.3.1-Source/io/CMakeLists.txt PCL-1.3.1-Source.fedora/io/CMakeLists.txt
 --- PCL-1.3.1-Source/io/CMakeLists.txt	2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source-fedora/io/CMakeLists.txt	2011-12-04 12:25:43.781363351 +0100
++++ PCL-1.3.1-Source.fedora/io/CMakeLists.txt	2012-01-16 19:40:43.436690163 +0100
 @@ -112,9 +112,10 @@
      endif(OPENNI_FOUND)
  
@@ -73,9 +73,27 @@ diff -urN PCL-1.3.1-Source/io/CMakeLists.txt PCL-1.3.1-Source-fedora/io/CMakeLis
      PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
        "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
  
-diff -urN PCL-1.3.1-Source/visualization/CMakeLists.txt PCL-1.3.1-Source-fedora/visualization/CMakeLists.txt
+diff -urN PCL-1.3.1-Source/PCLConfig.cmake.in PCL-1.3.1-Source.fedora/PCLConfig.cmake.in
+--- PCL-1.3.1-Source/PCLConfig.cmake.in	2011-12-03 00:35:48.000000000 +0100
++++ PCL-1.3.1-Source.fedora/PCLConfig.cmake.in	2012-01-16 19:47:07.404643739 +0100
+@@ -304,9 +304,13 @@
+ # PCLConfig.cmake is installed to PCL_ROOT/cmake
+   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+ else(WIN32)
+-# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
++  # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y or PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl
+   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+   get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
++  if (${PCL_DIR} MATCHES ".*lib.*")
++    # PCLConfig.cmake is installed to PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl
++    get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
++  endif()
+ endif(WIN32)
+ 
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
+diff -urN PCL-1.3.1-Source/visualization/CMakeLists.txt PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt
 --- PCL-1.3.1-Source/visualization/CMakeLists.txt	2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source-fedora/visualization/CMakeLists.txt	2011-12-04 12:25:43.782363348 +0100
++++ PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt	2012-01-16 19:40:43.437690160 +0100
 @@ -81,9 +81,9 @@
       target_link_libraries(${LIB_NAME} pcl_io pcl_kdtree pcl_range_image 
                                         vtkCommon vtkWidgets vtkHybrid)

diff --git a/pcl.spec b/pcl.spec
index 4607e03..10483e5 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,6 +1,6 @@
 Name:           pcl
 Version:        1.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for point cloud processing
 
 Group:          System Environment/Libraries
@@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 16 2012 Tim Niemueller <tim@niemueller.de> - 1.3.1-5
+- Update patch to fix PCLConfig.cmake
+
 * Sat Jan 14 2012 Rich Mattes <richmattes@gmail.com> - 1.3.1-4
 - Rebuild for gcc-4.7 and flann-1.7.1