[evince] Update to 2.91.0 so we can rebuild against current gtk3

Mon Oct 4 22:05:04 UTC 2010

commit 742d8e483e415325aade1b68070eb1d008a6ace5
Author: Owen W. Taylor <otaylor at fishsoup.net>
Date:   Mon Oct 4 18:04:36 2010 -0400

    Update to 2.91.0 so we can rebuild against current gtk3

 .gitignore                                  |    1 +
 evince-2.91.0-introspection-build-fix.patch |   24 ++
 evince.spec                                 |   43 ++-
 gtk-build-fixes.patch                       |  496 ---------------------------
 sources                                     |    2 +-
 5 files changed, 51 insertions(+), 515 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2c54e0a..b4ad850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ evince-2.31.6.tar.bz2
 /evince-2.31.90.tar.bz2
 evince-2.31.92.tar.bz2
 /evince-2.32.0.tar.bz2
+/evince-2.91.0.tar.bz2
diff --git a/evince-2.91.0-introspection-build-fix.patch b/evince-2.91.0-introspection-build-fix.patch
new file mode 100644
index 0000000..34b41a9
--- /dev/null
+++ b/evince-2.91.0-introspection-build-fix.patch
@@ -0,0 +1,24 @@
+diff -up evince-2.91.0/libdocument/Makefile.am.gtk3-introspection evince-2.91.0/libdocument/Makefile.am
+--- evince-2.91.0/libdocument/Makefile.am.gtk3-introspection	2010-09-28 04:25:31.000000000 -0400
++++ evince-2.91.0/libdocument/Makefile.am	2010-10-04 17:44:49.037388415 -0400
+@@ -158,7 +158,7 @@ EvinceDocument-$(EV_API_VERSION).gir: li
+ 	--include=Gdk-2.0 \
+ 	--include=GdkPixbuf-2.0 \
+ 	--include=Gtk-2.0 \
+-	--library=evdocument \
++	--library=evdocument3 \
+ 	--libtool="$(SAVED_LIBTOOL)" \
+ 	--output $@ \
+ 	--pkg evince-document-$(EV_API_VERSION) \
+diff -up evince-2.91.0/libview/Makefile.am.gtk3-introspection evince-2.91.0/libview/Makefile.am
+--- evince-2.91.0/libview/Makefile.am.gtk3-introspection	2010-10-04 17:46:52.099042343 -0400
++++ evince-2.91.0/libview/Makefile.am	2010-10-04 17:46:59.080625757 -0400
+@@ -131,7 +131,7 @@ EvinceView-$(EV_API_VERSION).gir: libevv
+ 	--include=GdkPixbuf-2.0 \
+ 	--include=Gtk-2.0 \
+ 	--include=EvinceDocument-$(EV_API_VERSION) \
+-	--library=evview \
++	--library=evview3 \
+ 	--libtool="$(LIBTOOL)" \
+ 	--output $@ \
+ 	--pkg evince-document-$(EV_API_VERSION) \
diff --git a/evince.spec b/evince.spec
index d53e8b5..08b10b4 100644
--- a/evince.spec
+++ b/evince.spec
@@ -4,17 +4,18 @@
 %global theme_version 2.17.1
 
 Name:           evince
-Version:        2.32.0
-Release:        2%{?dist}
+Version:        2.91.0
+Release:        1%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GFDL
 Group:          Applications/Publishing
 URL:            http://projects.gnome.org/evince/
-Source0:        http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
 Patch2:         evince-t1font-mapping.patch
-Patch4:         gtk-build-fixes.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=631360
+Patch3:         evince-2.91.0-introspection-build-fix.patch
 
 BuildRequires:  gtk3-devel
 BuildRequires:  glib2-devel >= %{glib2_version}
@@ -36,6 +37,8 @@ BuildRequires:  intltool
 BuildRequires:  t1lib-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  gobject-introspection-devel
+# For patch3
+BuildRequires:  automake
 
 # for the nautilus properties page
 BuildRequires: nautilus-devel
@@ -106,9 +109,10 @@ It adds an additional tab called "Document" to the file properties dialog.
 %prep
 %setup -q
 %patch2 -p1 -b .t1font-map
-%patch4 -p1 -b .build-fixes
+%patch3 -p1 -b .introspection-build-fix
 
 %build
+automake
 %configure \
         --disable-static \
         --disable-scrollkeeper \
@@ -195,8 +199,8 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %files libs
 %defattr(-,root,root,-)
 %doc README COPYING NEWS AUTHORS
-%{_libdir}/libevview.so.*
-%{_libdir}/libevdocument.so.*
+%{_libdir}/libevview3.so.*
+%{_libdir}/libevdocument3.so.*
 %dir %{_libdir}/evince
 %dir %{_libdir}/evince/3
 %dir %{_libdir}/evince/3/backends
@@ -208,22 +212,22 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/evince/3/backends/tiffdocument.evince-backend
 %{_libdir}/evince/3/backends/libcomicsdocument.so
 %{_libdir}/evince/3/backends/comicsdocument.evince-backend
-%{_libdir}/girepository-1.0/EvinceDocument-2.32.typelib
-%{_libdir}/girepository-1.0/EvinceView-2.32.typelib
+%{_libdir}/girepository-1.0/EvinceDocument-3.0.typelib
+%{_libdir}/girepository-1.0/EvinceView-3.0.typelib
 
 %files devel
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/evince/
-%{_datadir}/gtk-doc/html/libevview-2.32
-%{_datadir}/gtk-doc/html/libevdocument-2.32
+%{_datadir}/gtk-doc/html/libevview-3.0
+%{_datadir}/gtk-doc/html/libevdocument-3.0
 %dir %{_includedir}/evince
-%{_includedir}/evince/2.32
-%{_libdir}/libevview.so
-%{_libdir}/libevdocument.so
-%{_libdir}/pkgconfig/evince-view-2.32.pc
-%{_libdir}/pkgconfig/evince-document-2.32.pc
-%{_datadir}/gir-1.0/EvinceDocument-2.32.gir
-%{_datadir}/gir-1.0/EvinceView-2.32.gir
+%{_includedir}/evince/3.0
+%{_libdir}/libevview3.so
+%{_libdir}/libevdocument3.so
+%{_libdir}/pkgconfig/evince-view-3.0.pc
+%{_libdir}/pkgconfig/evince-document-3.0.pc
+%{_datadir}/gir-1.0/EvinceDocument-3.0.gir
+%{_datadir}/gir-1.0/EvinceView-3.0.gir
 
 %files dvi
 %defattr(-,root,root,-)
@@ -240,6 +244,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 
 %changelog
+* Mon Oct 4 2010 Owen Taylor <otaylor at redhat.com> - 2.91.0-1
+- Update to 2.91.0 so we can rebuild against current gtk3
+
 * Fri Oct  1 2010 Marek Kasik <mkasik at redhat.com> - 2.32.0-2
 - Rebuild against newer poppler
 
diff --git a/sources b/sources
index ecc6daf..9935d3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebc3ce6df8dcbf29cb9492f8dd031319  evince-2.32.0.tar.bz2
+b5a615aa44dc7cdd39859c203a2da7f7  evince-2.91.0.tar.bz2
