[openjpeg/f16] revert poppler regression patch, breaks ABI (#796500) backport pkgconfig includedir path fix (upstre

[Rex Dieter]

commit 745869ca7011c574166eeab5b58c343099e82cd2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 1 08:05:18 2012 -0600

    revert poppler regression patch, breaks ABI (#796500)
    backport pkgconfig includedir path fix (upstream issue #118)

 openjpeg-1.4-cmake_pkgconfig.patch |   12 ++++++------
 openjpeg.spec                      |    8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/openjpeg-1.4-cmake_pkgconfig.patch b/openjpeg-1.4-cmake_pkgconfig.patch
index 766e7a2..e8b255d 100644
--- a/openjpeg-1.4-cmake_pkgconfig.patch
+++ b/openjpeg-1.4-cmake_pkgconfig.patch
@@ -1,7 +1,7 @@
 diff -up openjpeg_v1_4_sources_r697/CMakeLists.txt.cmake_pkgconfig openjpeg_v1_4_sources_r697/CMakeLists.txt
---- openjpeg_v1_4_sources_r697/CMakeLists.txt.cmake_pkgconfig	2011-01-12 13:56:33.013889063 -0600
-+++ openjpeg_v1_4_sources_r697/CMakeLists.txt	2011-01-12 13:59:55.124735760 -0600
-@@ -144,6 +144,16 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
+--- openjpeg_v1_4_sources_r697/CMakeLists.txt.cmake_pkgconfig	2012-03-01 07:59:00.354181751 -0600
++++ openjpeg_v1_4_sources_r697/CMakeLists.txt	2012-03-01 07:59:00.358182347 -0600
+@@ -144,6 +146,16 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
                 @ONLY IMMEDIATE)
  ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
  
@@ -19,14 +19,14 @@ diff -up openjpeg_v1_4_sources_r697/CMakeLists.txt.cmake_pkgconfig openjpeg_v1_4
  # Always build the library
  INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 diff -up openjpeg_v1_4_sources_r697/libopenjpeg1.pc.cmake.cmake_pkgconfig openjpeg_v1_4_sources_r697/libopenjpeg1.pc.cmake
---- 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
+--- openjpeg_v1_4_sources_r697/libopenjpeg1.pc.cmake.cmake_pkgconfig	2012-03-01 07:59:00.356182049 -0600
++++ openjpeg_v1_4_sources_r697/libopenjpeg1.pc.cmake	2012-03-01 08:02:33.065869807 -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@
++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@/@subdir@
 +
 +Name: openjpeg
 +Description: JPEG2000 files library
diff --git a/openjpeg.spec b/openjpeg.spec
index db5404e..d94e5f1 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -12,7 +12,7 @@
 
 Name:    openjpeg
 Version: 1.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: JPEG 2000 command line tools
 
 Group:   Applications/Multimedia
@@ -94,7 +94,7 @@ rm -rf libs
 %patch52 -p1 -b .autoconf
 autoreconf -i -f
 %endif
-%patch100 -p1 -b .poppler_regression
+#patch100 -p1 -b .poppler_regression
 
 
 %build
@@ -192,6 +192,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 01 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4-12
+- revert poppler regression patch, breaks ABI (#796500)
+- backport pkgconfig includedir path fix (upstream issue #118)
+
 * Wed Feb 01 2012 Jaromir Capik <jcapik at redhat.com> 1.4-11
 - fix for #726262 - /usr/include/openjpeg changed to a symlink
 - rpm bug workaround