diff --git a/.gitignore b/.gitignore index b4ad850..cf27660 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ evince-2.31.6.tar.bz2 evince-2.31.92.tar.bz2 /evince-2.32.0.tar.bz2 /evince-2.91.0.tar.bz2 +/evince-2.91.1.tar.bz2 diff --git a/evince-2.91.0-introspection-build-fix.patch b/evince-2.91.0-introspection-build-fix.patch deleted file mode 100644 index 34b41a9..0000000 --- a/evince-2.91.0-introspection-build-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-2.91.1-requires.patch b/evince-2.91.1-requires.patch new file mode 100644 index 0000000..38d6a5b --- /dev/null +++ b/evince-2.91.1-requires.patch @@ -0,0 +1,10 @@ +--- evince-2.91.1/evince-document.pc.in 2010-10-09 16:10:38.000000000 +0200 ++++ evince-2.91.1/evince-document.pc.in 2010-10-26 14:52:48.000000000 +0200 +@@ -7,6 +7,6 @@ backenddir=@libdir@/evince/@EV_BINARY_VE + Name: Evince Document + Description: GNOME document viewer backend library + Version: @VERSION@ +-Requires: gio-2.0 >= @GLIB_REQUIRED@ gtk+-3 >= @GTK_REQUIRED@ ++Requires: gio-2.0 >= @GLIB_REQUIRED@ gtk+-3.0 >= @GTK_REQUIRED@ + Libs: -L${libdir} -levdocument3 + Cflags: -I${includedir} diff --git a/evince.spec b/evince.spec index 08b10b4..6058c56 100644 --- a/evince.spec +++ b/evince.spec @@ -4,7 +4,7 @@ %global theme_version 2.17.1 Name: evince -Version: 2.91.0 +Version: 2.91.1 Release: 1%{?dist} Summary: Document viewer @@ -14,8 +14,8 @@ URL: http://projects.gnome.org/evince/ 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 -# https://bugzilla.gnome.org/show_bug.cgi?id=631360 -Patch3: evince-2.91.0-introspection-build-fix.patch + +Patch3: evince-2.91.1-requires.patch BuildRequires: gtk3-devel BuildRequires: glib2-devel >= %{glib2_version} @@ -109,7 +109,7 @@ It adds an additional tab called "Document" to the file properties dialog. %prep %setup -q %patch2 -p1 -b .t1font-map -%patch3 -p1 -b .introspection-build-fix +%patch3 -p1 -b .requires %build automake @@ -190,7 +190,6 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/evince.* %{_mandir}/man1/evince.1.gz -%{_libexecdir}/evince-convert-metadata %{_libexecdir}/evinced %{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml @@ -244,6 +243,11 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so %changelog +* Tue Oct 26 2010 Marek Kasik - 2.91.1-1 +- Update to 2.91.1 +- Remove evince-2.91.0-introspection-build-fix.patch +- Add evince-2.91.1-requires.patch + * Mon Oct 4 2010 Owen Taylor - 2.91.0-1 - Update to 2.91.0 so we can rebuild against current gtk3 diff --git a/sources b/sources index 9935d3e..de98b44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5a615aa44dc7cdd39859c203a2da7f7 evince-2.91.0.tar.bz2 +1526b2353429f42d65fe30313169ebe8 evince-2.91.1.tar.bz2