[pypoppler/el6: 4/4] Merge branch 'master' into el6

[Fabian Affolter]

commit 2de58c827338873821df49334028b2e9de5bdfd5
Merge: befa84b 950eceb
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Jan 6 21:27:06 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	pypoppler.spec

 alexandervdm_316722.patch |   66 +++++++++++++++++++++++++++++++++++++++++++++
 pypoppler.spec            |   26 ++++++++++-------
 2 files changed, 81 insertions(+), 11 deletions(-)
---
diff --cc pypoppler.spec
index 5cd75d7,4b1a4d5..5248737
--- a/pypoppler.spec
+++ b/pypoppler.spec
@@@ -34,11 -34,14 +34,14 @@@ Patch0:		75_74.dif
  Patch2:		79_78.diff
  
  # Changes for poppler 1.5
 -Patch3:		pypoppler-0.12.1-poppler0.15.0-changes.patch
 +#Patch3:		pypoppler-0.12.1-poppler0.15.0-changes.patch
  
  # Minimal fix for changes in poppler 0.18
 -Patch4:		pypoppler-0.12.1-poppler-0.18.0-minimal-fix.patch
 +#Patch4:		pypoppler-0.12.1-poppler-0.18.0-minimal-fix.patch
  
+ # Fix for resource leaks
+ Patch5:     alexandervdm_316722.patch
+ 
  %description
  Python bindings for the Poppler PDF rendering library. It is needed to
  run programs written in Python and using Poppler set.