Update to 0.20.0

.gitignore

@@ -1,3 +1,4 @@
 /poppler-0.16.7.tar.gz
 /poppler-0.18.0.tar.gz
 /poppler-0.18.4.tar.gz
+/poppler-0.20.0.tar.gz

poppler-0.18.1-glib.patch

@@ -1,13 +0,0 @@
-diff -up poppler-0.18.1/glib/demo/main.c.glib poppler-0.18.1/glib/demo/main.c
---- poppler-0.18.1/glib/demo/main.c.glib	2011-09-28 08:42:50.000000000 -0500
-+++ poppler-0.18.1/glib/demo/main.c	2011-10-28 11:15:30.189241783 -0500
-@@ -300,9 +300,6 @@ gint main (gint argc, gchar **argv)
- 		return 1;
- 	}
- 
--	if (!g_thread_supported ())
--		g_thread_init (NULL);
--
- 	gtk_init (&argc, &argv);
- 
- 	file = g_file_new_for_commandline_arg (argv[1]);

poppler-0.18.4-set-mask-matrix.patch

@@ -1,10 +0,0 @@
---- poppler-0.18.4/poppler/CairoOutputDev.cc	2012-02-15 18:06:48.000000000 +0100
-+++ poppler-0.18.4/poppler/CairoOutputDev.cc	2012-05-04 13:04:57.000000000 +0200
-@@ -2789,6 +2789,7 @@ void CairoOutputDev::drawImage(GfxState
-     cairo_rectangle (cairo, 0., 0., 1., 1.);
-   if (maskPattern) {
-     cairo_clip (cairo);
-+    cairo_set_matrix (cairo, &mask_matrix);
-     cairo_mask (cairo, maskPattern);
-   } else {
-     cairo_fill (cairo);

poppler.spec

@@ -1,8 +1,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.18.4
-Release: 3%{?dist}
+Version: 0.20.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -12,12 +12,6 @@ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 # http://bugzilla.redhat.com/show_bug.cgi?id=480868
 Patch1: poppler-0.12.4-annot-appearance.patch
 
-# poppler-glib-demo, drop extraneous g_thread_init
-Patch2: poppler-0.18.1-glib.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=817378
-Patch3: poppler-0.18.4-set-mask-matrix.patch
-
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
 BuildRequires: gettext-devel
@@ -126,12 +120,6 @@ converting PDF files to a number of other formats.
 
 #patch1 -p1 -b .annot
 
-%if 0%{?fedora} > 16
-%patch2 -p1 -b .glib
-%endif
-
-%patch3 -p1 -b .set-mask-matrix
-
 chmod -x goo/GooTimer.h
 
 iconv -f iso-8859-1 -t utf-8 < "utils/pdftohtml.1" > "utils/pdftohtml.1.utf8"
@@ -196,7 +184,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_libdir}/libpoppler.so.19*
+%{_libdir}/libpoppler.so.25*
 
 %files devel
 %defattr(-,root,root,-)
@@ -226,7 +214,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 %files qt
 %defattr(-,root,root,-)
-%{_libdir}/libpoppler-qt4.so.3*
+%{_libdir}/libpoppler-qt4.so.4*
 
 %files qt-devel
 %defattr(-,root,root,-)
@@ -251,6 +239,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Wed May 16 2012 Marek Kasik <mkasik@redhat.com> 0.20.0-1
+- Update to 0.20.0
+
 * Fri May  4 2012 Marek Kasik <mkasik@redhat.com> 0.18.4-3
 - Backport of a patch which sets mask matrix before drawing an image with a mask
 - Resolves: #817378

sources

@@ -1 +1 @@
-12658f3308597e57f3faff538cc73baf  poppler-0.18.4.tar.gz
+5bca54b9561bf5b14d9344efce2cd4f3  poppler-0.20.0.tar.gz