From c1867c6f24cabcb9fb891d25e0bad652fe751868 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 13 Jul 2010 01:35:32 +0000
Subject: [PATCH] 2.31.5

---
 .cvsignore  |  2 +-
 evince.spec | 19 ++++++++++++-------
 sources     |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2e852cd..0c6f55f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evince-2.31.4.tar.bz2
+evince-2.31.5.tar.bz2
diff --git a/evince.spec b/evince.spec
index ac0b353..ba8486c 100644
--- a/evince.spec
+++ b/evince.spec
@@ -1,11 +1,10 @@
 %global poppler_version 0.14.0
 %global glib2_version 2.25.9
-%global gtk2_version 2.20.0
 %global dbus_version 0.70
 %global theme_version 2.17.1
 
 Name:           evince
-Version:        2.31.4
+Version:        2.31.5
 Release:        1%{?dist}
 Summary:        Document viewer
 
@@ -16,10 +15,7 @@ Source0:        http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
 Patch2:         evince-t1font-mapping.patch
 
-# upstream build fix
-Patch3: 0001-pdf-Fix-build-when-text_layout-is-not-available.patch
-
-BuildRequires:  gtk2-devel >= %{gtk2_version}
+BuildRequires:  gtk3-devel
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  poppler-glib-devel >= %{poppler_version}
 BuildRequires:  libXt-devel
@@ -38,6 +34,7 @@ BuildRequires:  gtk-doc
 BuildRequires:  intltool
 BuildRequires:  t1lib-devel
 BuildRequires:  GConf2-devel
+BuildRequires:  gobject-introspection-devel
 
 # for the nautilus properties page
 BuildRequires: nautilus-devel
@@ -108,13 +105,13 @@ It adds an additional tab called "Document" to the file properties dialog.
 %prep
 %setup -q
 %patch2 -p1 -b .t1font-map
-%patch3 -p1 -b .poppler-layout
 
 %build
 %configure \
         --disable-static \
         --disable-scrollkeeper \
         --disable-schemas-install \
+        --enable-introspection \
         --enable-comics=yes \
         --enable-dvi=yes \
         --enable-djvu=yes \
@@ -208,6 +205,8 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/evince/2/backends/tiffdocument.evince-backend
 %{_libdir}/evince/2/backends/libcomicsdocument.so
 %{_libdir}/evince/2/backends/comicsdocument.evince-backend
+%{_libdir}/girepository-1.0/EvinceDocument-2.30.typelib
+%{_libdir}/girepository-1.0/EvinceView-2.30.typelib
 
 %files devel
 %defattr(-,root,root,-)
@@ -220,6 +219,8 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/libevdocument.so
 %{_libdir}/pkgconfig/evince-view-2.30.pc
 %{_libdir}/pkgconfig/evince-document-2.30.pc
+%{_datadir}/gir-1.0/EvinceDocument-2.30.gir
+%{_datadir}/gir-1.0/EvinceView-2.30.gir
 
 %files dvi
 %defattr(-,root,root,-)
@@ -235,6 +236,10 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 
 %changelog
+* Mon Jul 12 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.5-1
+- Update to 2.31.5
+- Enable introspection
+
 * Tue Jun 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.4-1
 - Update to 2.31.4
 
diff --git a/sources b/sources
index 82b09f5..893ab89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f11eaca02212a415b503ec7e8b8d27f6  evince-2.31.4.tar.bz2
+a1f89970d701c35bf2d0b79f1232d9cc  evince-2.31.5.tar.bz2