From a424ababe4747607ec743c35436f84155a9407c3 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Tue, 6 Dec 2011 13:46:01 +0100
Subject: [PATCH] Update to 0.18.2

Remove upstreamed patches
---
 .gitignore                                   |  1 +
 poppler-0.18.1-pkgconfig_GLIB_REQUIRED.patch | 47 --------------------
 poppler.spec                                 | 13 +++---
 sources                                      |  2 +-
 4 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 poppler-0.18.1-pkgconfig_GLIB_REQUIRED.patch

diff --git a/.gitignore b/.gitignore
index 989bc9e..4758dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /poppler-0.17.3.tar.gz
 /poppler-0.18.0.tar.gz
 /poppler-0.18.1.tar.gz
+/poppler-0.18.2.tar.gz
diff --git a/poppler-0.18.1-pkgconfig_GLIB_REQUIRED.patch b/poppler-0.18.1-pkgconfig_GLIB_REQUIRED.patch
deleted file mode 100644
index b15b6e9..0000000
--- a/poppler-0.18.1-pkgconfig_GLIB_REQUIRED.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up poppler-0.18.1/configure.ac.pkgconfig_GLIB_REQUIRED poppler-0.18.1/configure.ac
---- poppler-0.18.1/configure.ac.pkgconfig_GLIB_REQUIRED	2011-10-26 07:34:22.000000000 -0500
-+++ poppler-0.18.1/configure.ac	2011-10-28 16:46:07.357243072 -0500
-@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; th
-   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
- 
-   GLIB_REQUIRED=2.18
-+  AC_SUBST(GLIB_REQUIRED)
-   AC_ARG_ENABLE(poppler-glib,
- 	        AC_HELP_STRING([--disable-poppler-glib],
- 		               [Don't compile poppler glib wrapper.]),
-diff -up poppler-0.18.1/poppler-glib.pc.cmake.pkgconfig_GLIB_REQUIRED poppler-0.18.1/poppler-glib.pc.cmake
---- poppler-0.18.1/poppler-glib.pc.cmake.pkgconfig_GLIB_REQUIRED	2011-10-17 06:42:29.000000000 -0500
-+++ poppler-0.18.1/poppler-glib.pc.cmake	2011-10-28 16:43:22.997297849 -0500
-@@ -6,7 +6,7 @@ includedir=${prefix}/include
- Name: poppler-glib
- Description: GLib wrapper for poppler
- Version: @POPPLER_VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- @PC_REQUIRES_PRIVATE@
- 
- Libs: -L${libdir} -lpoppler-glib
-diff -up poppler-0.18.1/poppler-glib.pc.in.pkgconfig_GLIB_REQUIRED poppler-0.18.1/poppler-glib.pc.in
---- poppler-0.18.1/poppler-glib.pc.in.pkgconfig_GLIB_REQUIRED	2011-10-17 06:42:29.000000000 -0500
-+++ poppler-0.18.1/poppler-glib.pc.in	2011-10-28 16:43:22.998297837 -0500
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: poppler-glib
- Description: GLib wrapper for poppler
- Version: @VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- @PC_REQUIRES_PRIVATE@
- 
- Libs: -L${libdir} -lpoppler-glib
-diff -up poppler-0.18.1/poppler-glib-uninstalled.pc.in.pkgconfig_GLIB_REQUIRED poppler-0.18.1/poppler-glib-uninstalled.pc.in
---- poppler-0.18.1/poppler-glib-uninstalled.pc.in.pkgconfig_GLIB_REQUIRED	2011-10-17 06:42:29.000000000 -0500
-+++ poppler-0.18.1/poppler-glib-uninstalled.pc.in	2011-10-28 16:43:22.998297837 -0500
-@@ -1,7 +1,7 @@
- Name: poppler-glib
- Description: GLib wrapper for poppler - uninstalled
- Version: @VERSION@
--Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
-+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- 
- Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
- Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
diff --git a/poppler.spec b/poppler.spec
index f392fab..431bc47 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,8 +1,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.18.1
-Release: 3%{?dist}
+Version: 0.18.2
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -15,10 +15,6 @@ Patch1: poppler-0.12.4-annot-appearance.patch
 # poppler-glib-demo, drop extraneous g_thread_init
 Patch2: poppler-0.18.1-glib.patch
 
-## upstream patches
-# fix poppler-glib.pc 
-Patch3: poppler-0.18.1-pkgconfig_GLIB_REQUIRED.patch
-
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
 BuildRequires: gettext-devel
@@ -130,7 +126,6 @@ converting PDF files to a number of other formats.
 %if 0%{?fedora} > 16
 %patch2 -p1 -b .glib
 %endif
-%patch3 -p1 -b .pkgconfig_GLIB_REQUIRED
 
 chmod -x goo/GooTimer.h
 
@@ -241,6 +236,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Tue Dec 06 2011 Marek Kasik <mkasik@redhat.com> - 0.18.2-1
+- Update to 0.18.2
+- Remove upstreamed patches
+
 * Mon Dec 05 2011 Adam Jackson <ajax@redhat.com> 0.18.1-3
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index 4dcb4ae..729539f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d30e883a27423c936ef338ce1d967e2d  poppler-0.18.1.tar.gz
+38616927823ef01937aab26872e957e4  poppler-0.18.2.tar.gz