[openjpeg/f16: 5/5] Merge remote-tracking branch 'origin/master' into f16

[Rex Dieter]

commit ba9d00a4e81c05a12f7b1bc24860f428b9a1cc48
Merge: d073910 f494d5c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 31 12:44:46 2012 -0600

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	openjpeg.spec

 openjpeg-1.4-poppler_regression.patch |  100 +++++++++++++++++++++++++++++++++
 openjpeg.spec                         |   16 +++++-
 2 files changed, 114 insertions(+), 2 deletions(-)
---
diff --cc openjpeg.spec
index e437506,687040d..88f6379
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@@ -52,6 -52,10 +52,11 @@@ Patch54: openjpeg-1.4-cmake_symlink_fix
  #  fix OpenJPEGConfig.cmake, https://bugzilla.redhat.com/show_bug.cgi?id=669425
  Patch55: openjpeg-1.4-OpenJPEGConfig.patch
  
+ ## upstream patches:
++# http://code.google.com/p/openjpeg/issues/detail?id=104
+ # http://code.google.com/p/openjpeg/source/detail?r=1333
+ Patch100: openjpeg-1.4-poppler_regression.patch
+ 
  %description
  OpenJPEG is an open-source JPEG 2000 codec written in C. It has been
  developed in order to promote the use of JPEG 2000, the new still-image
@@@ -183,6 -188,9 +189,12 @@@ rm -rf %{buildroot
  
  
  %changelog
++* Tue Jan 31 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4-10
++- backport upstream patch to avoid poppler regressions (upstream issue #104)
++
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Aug 01 2011 Oliver Falk <oliver at linux-kernel.at> 1.4-8
  - Remove pkgconfig from reqs (my fault)