[openjpeg] fix pkgconfig support (upstream issue 67)

[Rex Dieter]

commit b8f3f5cf8a846b75e72cb42f1e79a4f8e7917f8d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 30 13:49:21 2011 -0500

    fix pkgconfig support (upstream issue 67)

 openjpeg-1.4-cmake_pkgconfig.patch |   14 +++++++-------
 openjpeg.spec                      |    7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/openjpeg-1.4-cmake_pkgconfig.patch b/openjpeg-1.4-cmake_pkgconfig.patch
index 382f06f..766e7a2 100644
--- a/openjpeg-1.4-cmake_pkgconfig.patch
+++ b/openjpeg-1.4-cmake_pkgconfig.patch
@@ -8,7 +8,7 @@ diff -up openjpeg_v1_4_sources_r697/CMakeLists.txt.cmake_pkgconfig openjpeg_v1_4
 +#----------------------------------------------------------------------------
 +# pkgconfig support
 +#if(NOT WIN32)
-+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc )
++  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
 +  INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
 +# This piece doesn't seem to work, not sure why  -- Rex
 +  INSTALL( CODE
@@ -22,15 +22,15 @@ diff -up openjpeg_v1_4_sources_r697/libopenjpeg1.pc.cmake.cmake_pkgconfig openjp
 --- openjpeg_v1_4_sources_r697/libopenjpeg1.pc.cmake.cmake_pkgconfig	2011-01-12 13:56:33.022889145 -0600
 +++ openjpeg_v1_4_sources_r697/libopenjpeg1.pc.cmake	2011-01-12 13:56:33.022889145 -0600
 @@ -0,0 +1,12 @@
-+prefix=${CMAKE_INSTALL_PREFIX}
-+bindir=${OPENJPEG_INSTALL_BIN_DIR}
-+datadir=${OPENJPEG_INSTALL_DATA_DIR}
-+libdir=${OPENJPEG_INSTALL_LIB_DIR}
-+includedir=${OPENJPEG_INSTALL_INCLUDE_DIR}
++prefix=@CMAKE_INSTALL_PREFIX@
++bindir=@OPENJPEG_INSTALL_BIN_DIR@
++datadir=@OPENJPEG_INSTALL_DATA_DIR@
++libdir=@OPENJPEG_INSTALL_LIB_DIR@
++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
 +
 +Name: openjpeg
 +Description: JPEG2000 files library
 +URL: http://code.google.com/p/openjpeg/
-+Version: ${OPENJPEG_VERSION} 
++Version: @OPENJPEG_VERSION@
 +Libs: -L${libdir} -lopenjpeg
 +Cflags: -I${includedir}
diff --git a/openjpeg.spec b/openjpeg.spec
index 2cdb9b2..1b89d75 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -6,13 +6,13 @@
 
 ## enable conformance tests, bloats srpm
 # enable for rawhide only, should disable in production releases
-%if 0%{?fedora} > 14
+%if 0%{?fedora} > 15
 %define runcheck 1
 %endif
 
 Name:    openjpeg
 Version: 1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: JPEG 2000 command line tools
 
 Group:   Applications/Multimedia
@@ -183,6 +183,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Mar 30 2011 Rex Dieter <rdieter at fedoraproject.org> 1.4-6
+- fix pkgconfig support (upstream issue 67)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild