[catkin/el6] Make pkg-config templates respect lib64 on 64 bit systems

[rmattes]

commit 6dc58499149736e453dd67b6ca9d8ed49442586d
Author: Rich Mattes <richmattes at gmail.com>
Date:   Mon Jun 3 21:51:30 2013 -0400

    Make pkg-config templates respect lib64 on 64 bit systems

 catkin-0.4.5-libdir.patch |   24 ++++++++++++++++++++++++
 catkin.spec               |   10 ++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/catkin-0.4.5-libdir.patch b/catkin-0.4.5-libdir.patch
new file mode 100644
index 0000000..de7e6b0
--- /dev/null
+++ b/catkin-0.4.5-libdir.patch
@@ -0,0 +1,24 @@
+diff -up ./cmake/catkin_project.cmake.libdir ./cmake/catkin_project.cmake
+--- ./cmake/catkin_project.cmake.libdir	2013-06-03 21:41:27.813479765 -0400
++++ ./cmake/catkin_project.cmake	2013-06-03 21:41:41.883587780 -0400
+@@ -120,7 +120,7 @@ function(catkin_project PACKAGE_NAME)
+     ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PACKAGE_NAME}.pc)
+ 
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PACKAGE_NAME}.pc
+-    DESTINATION lib/pkgconfig
++    DESTINATION lib${LIB_SUFFIX}/pkgconfig
+     )
+ 
+   string(TOLOWER ${PROJECT_NAME} project_lower)
+diff -up ./cmake/templates/setup.sh.installable.in.libdir ./cmake/templates/setup.sh.installable.in
+--- ./cmake/templates/setup.sh.installable.in.libdir	2013-06-03 21:40:56.360236602 -0400
++++ ./cmake/templates/setup.sh.installable.in	2013-06-03 21:41:13.024930743 -0400
+@@ -25,7 +25,7 @@ else
+   export LD_LIBRARY_PATH
+ fi
+ 
+-PKG_CONFIG_PATH=@CMAKE_INSTALL_PREFIX@/lib/pkgconfig:$PKG_CONFIG_PATH
++PKG_CONFIG_PATH=@CMAKE_INSTALL_PREFIX@/lib at LIB_SUFFIX@/pkgconfig:$PKG_CONFIG_PATH
+ export PKG_CONFIG_PATH
+ 
+ if [ -z "$CATKIN_SHELL" ] ; then
diff --git a/catkin.spec b/catkin.spec
index 3106e3d..5dccd21 100644
--- a/catkin.spec
+++ b/catkin.spec
@@ -2,7 +2,7 @@
 
 Name:           catkin
 Version:        0.4.5
-Release:        6.git%{gitrev}%{?dist}
+Release:        7.git%{gitrev}%{?dist}
 Summary:        Collection of CMake macros for ROS
 
 License:        BSD
@@ -17,6 +17,8 @@ Patch1:         %{name}-0.4.5-catkinutil.patch
 Patch2:         %{name}-0.4.5-catkinsphinx.patch
 # Remove #!/usr/bin/env from python helpers.  Not upstream
 Patch3:         %{name}-0.4.5-scripts.patch
+# Add LIB_SUFFIX to pkg-config installation directory
+Patch4:         %{name}-0.4.5-libdir.patch
 
 Provides:       ros-%{name} = %{version}-%{release}
 BuildArch:      noarch
@@ -65,6 +67,7 @@ Requires:  python-setuptools-devel
 %patch1 -p0 -b .catkinutil
 %patch2 -p0 -b .catkinsphinx
 %patch3 -p0
+%patch4 -p0 -b .libdir
 
 %build
 mkdir build
@@ -96,7 +99,7 @@ mv $RPM_BUILD_ROOT%{_usr}/setup.* $RPM_BUILD_ROOT%{_datadir}/ros
 mv $RPM_BUILD_ROOT%{_usr}/env.sh $RPM_BUILD_ROOT%{_datadir}/ros
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig
-mv $RPM_BUILD_ROOT%{_usr}/lib/pkgconfig/catkin.pc $RPM_BUILD_ROOT/%{_datadir}/pkgconfig
+mv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/catkin.pc $RPM_BUILD_ROOT/%{_datadir}/pkgconfig
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/profile.d
 mv $RPM_BUILD_ROOT%{_usr}/etc/%{name}/profile.d/* $RPM_BUILD_ROOT/etc/%{name}/profile.d
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/cmake
 
 %changelog
+* Tue Jun 04 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-7.gitd4f1f24
+- Make pkg-config templates respect lib64 on 64 bit systems
+
 * Thu Mar 28 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-6.gitd4f1f24
 - Remove shebangs from shell templates and python helper functions