diff --git a/.gitignore b/.gitignore index 6a1ca52..1595727 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ evince-3.0.0.tar.bz2 /evince-3.4.0.tar.xz /evince-3.5.2.tar.xz /evince-3.5.3.tar.xz +/evince-3.5.4.tar.xz diff --git a/0001-libdocument-libview-Fix-GIR-generation.patch b/0001-libdocument-libview-Fix-GIR-generation.patch deleted file mode 100644 index ae70913..0000000 --- a/0001-libdocument-libview-Fix-GIR-generation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0cad0892dfcd9e06b8671d1641662e33e52c0ad8 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Wed, 27 Jun 2012 16:06:49 +1200 -Subject: [PATCH] libdocument, libview: Fix GIR generation - ---- - libdocument/Makefile.am | 2 +- - libview/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am -index 59c369e..0a6000e 100644 ---- a/libdocument/Makefile.am -+++ b/libdocument/Makefile.am -@@ -153,7 +153,7 @@ EXTRA_DIST = \ - - if ENABLE_INTROSPECTION - --EvinceDocument-$(EV_API_VERSION).gir: libevdocument3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument3_la_SOURCES)) -+EvinceDocument-$(EV_API_VERSION).gir: libevdocument3.la Makefile $(INST_H_SRC_FILES) $(INST_H_BUILT_FILES) $(filter %.c,$(libevdocument3_la_SOURCES)) $(filter %.c,$(nodist_libevdocument3_la_SOURCES)) - $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \ - $(G_IR_SCANNER) -v --namespace EvinceDocument \ - --strip-prefix=Ev \ -diff --git a/libview/Makefile.am b/libview/Makefile.am -index 81b68a9..65b9f84 100644 ---- a/libview/Makefile.am -+++ b/libview/Makefile.am -@@ -123,7 +123,7 @@ EXTRA_DIST = \ - - if ENABLE_INTROSPECTION - --EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview3_la_SOURCES)) -+EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_SRC_FILES) $(INST_H_BUILT_FILES) $(filter %.c,$(libevview3_la_SOURCES)) $(filter %.c,$(nodist_libevview3_la_SOURCES)) - $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \ - $(G_IR_SCANNER) -v --namespace EvinceView \ - --add-include-path=$(top_builddir)/libdocument \ --- -1.7.10.4 - diff --git a/evince.spec b/evince.spec index d9e4779..065e288 100644 --- a/evince.spec +++ b/evince.spec @@ -5,15 +5,14 @@ %global gxps_version 0.2.0 Name: evince -Version: 3.5.3 -Release: 2%{?dist} +Version: 3.5.4 +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}/3.5/%{name}-%{version}.tar.xz -Patch0: 0001-libdocument-libview-Fix-GIR-generation.patch BuildRequires: gtk3-devel BuildRequires: glib2-devel >= %{glib2_version} @@ -108,7 +107,6 @@ It adds an additional tab called "Document" to the file properties dialog. %prep %setup -q -%patch0 -p1 -b .gir %build ./autogen.sh @@ -225,6 +223,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||: %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so %changelog +* Tue Jul 17 2012 Marek Kasik - 3.5.4-1 +- Update to 3.5.4 + * Thu Jun 28 2012 Kalev Lember - 3.5.3-2 - Fix the build by backporting a GIR generation fix diff --git a/sources b/sources index 600bfa6..1a43f4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62e27ad1f415c30529cafa9658a57f9a evince-3.5.3.tar.xz +00aa90b65aff636e5c7c79f404519c51 evince-3.5.4.tar.xz