Update to 0.22.0

.gitignore

@@ -4,3 +4,4 @@
 /poppler-0.20.0.tar.gz
 /poppler-0.20.1.tar.gz
 /poppler-0.20.2.tar.gz
+/poppler-0.22.0.tar.gz

poppler.spec

@@ -1,29 +1,12 @@
 Summary: PDF rendering library
 Name: poppler
-Version: 0.20.2
+Version: 0.22.0
-Release: 9%{?dist}
+Release: 1%{?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
 
-## backported patches
-
-# https://bugs.freedesktop.org/show_bug.cgi?id=52197
-# https://bugs.freedesktop.org/show_bug.cgi?id=51982
-# https://bugs.freedesktop.org/show_bug.cgi?id=52215
-# https://bugs.freedesktop.org/show_bug.cgi?id=52384
-# https://bugs.freedesktop.org/show_bug.cgi?id=52488
-# https://bugs.freedesktop.org/show_bug.cgi?id=3498
-# https://bugs.kde.org/show_bug.cgi?id=306008
-# https://bugs.freedesktop.org/show_bug.cgi?id=55573
-# https://bugs.freedesktop.org/show_bug.cgi?id=55521
-# https://bugs.freedesktop.org/show_bug.cgi?id=54090
-# https://bugs.freedesktop.org/show_bug.cgi?id=6923
-# and some other commits without bug references
-# (see header of the patch for complete list)
-Patch1: poppler-0.20.3-5.patch
-
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
 BuildRequires: gettext-devel
@@ -31,7 +14,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: openjpeg-devel >= 1.3-5
 BuildRequires: pkgconfig(cairo) >= 1.10.0
 BuildRequires: pkgconfig(gobject-introspection-1.0) 
-BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(lcms)
 BuildRequires: pkgconfig(QtGui) pkgconfig(QtXml)
 
@@ -130,6 +113,7 @@ converting PDF files to a number of other formats.
 %package demos
 Summary: Demos for poppler
 Group: Applications/Text
+Requires: %{name}{?_isa} = %{version}-%{release}
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 
 %description demos
@@ -138,10 +122,6 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 %prep
 %setup -q
 
-%patch1 -p1 -b .0.20.5
-
-chmod -x goo/GooTimer.h
-
 iconv -f iso-8859-1 -t utf-8 < "utils/pdftohtml.1" > "utils/pdftohtml.1.utf8"
 mv "utils/pdftohtml.1.utf8" "utils/pdftohtml.1"
 
@@ -204,7 +184,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_libdir}/libpoppler.so.26*
+%{_libdir}/libpoppler.so.34*
 
 %files devel
 %defattr(-,root,root,-)
@@ -263,6 +243,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Fri Jan 18 2013 Marek Kasik <mkasik@redhat.com> 0.22.0-1
+- Update to 0.22.0
+
 * Tue Nov 13 2012 Marek Kasik <mkasik@redhat.com> 0.20.2-9
 - Move poppler-glib-demo to new sub-package demos
 - Resolves: #872338

sources

@@ -1 +1 @@
-45dd2c16c8c4d1a39e830e45745c4e25  poppler-0.20.2.tar.gz
+c7038be37a7d446544e83a7df3c26196  poppler-0.22.0.tar.gz