From 6f072c2af78b8962f35f1edd4fbcaa3afcfc9eda Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Wed, 31 Oct 2012 16:18:31 +0100
Subject: [PATCH] Remove unused patch

---
 poppler-0.12.4-annot-appearance.patch | 14 --------------
 poppler.spec                          | 10 ++++------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 poppler-0.12.4-annot-appearance.patch

diff --git a/poppler-0.12.4-annot-appearance.patch b/poppler-0.12.4-annot-appearance.patch
deleted file mode 100644
index 2d5323d..0000000
--- a/poppler-0.12.4-annot-appearance.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- poppler-0.12.4/poppler/Annot.cc	2010-01-17 01:06:58.000000000 +0100
-+++ poppler-0.12.4/poppler/Annot.cc	2010-03-04 12:50:56.000000000 +0100
-@@ -3173,7 +3173,10 @@ void AnnotWidget::generateFieldAppearanc
-   obj1.free();
- 
-   // get the default appearance string
--  if (Form::fieldLookup(field, "DA", &obj1)->isNull()) {
-+  if (Form::fieldLookup(annot, "DA", &obj1)->isNull()) {
-+    obj1.free();
-+  }
-+  if (!obj1.isString() && Form::fieldLookup(field, "DA", &obj1)->isNull()) {
-     obj1.free();
-     acroForm->lookup("DA", &obj1);
-   }
diff --git a/poppler.spec b/poppler.spec
index d37bad5..7aae26e 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -2,16 +2,12 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.20.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 
-## upstreamable patches
-# http://bugzilla.redhat.com/show_bug.cgi?id=480868
-Patch1: poppler-0.12.4-annot-appearance.patch
-
 ## backported patches
 # http://bugzilla.redhat.com/show_bug.cgi?id=845578
 # https://bugs.freedesktop.org/show_bug.cgi?id=3498
@@ -130,7 +126,6 @@ converting PDF files to a number of other formats.
 %prep
 %setup -q
 
-#patch1 -p1 -b .annot
 %patch2 -p1 -b .empty-password
 %patch3 -p1 -b .scale-init
 %patch4 -p1 -b .ps-conversion
@@ -254,6 +249,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Wed Oct 31 2012 Marek Kasik <mkasik@redhat.com> 0.20.2-5
+- Remove unused patch
+
 * Wed Oct 31 2012 Marek Kasik <mkasik@redhat.com> 0.20.2-4
 - Update License field