From 4cf78e37e2d04c579b3b6bbdc51220bbbe8c16f0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 27 May 2010 20:16:52 +0000 Subject: [PATCH] 2.31.2 --- evince.spec | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/evince.spec b/evince.spec index 1005b64..72a99c1 100644 --- a/evince.spec +++ b/evince.spec @@ -5,8 +5,8 @@ %global theme_version 2.17.1 Name: evince -Version: 2.31.1 -Release: 3%{?dist} +Version: 2.31.2 +Release: 1%{?dist} Summary: Document viewer License: GPLv2+ and GFDL @@ -16,11 +16,6 @@ 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 -# migrate user data from GConf to dconf -# https://bugzilla.gnome.org/show_bug.cgi?id=619335 -Patch3: evince-settings-migration.patch -BuildRequires: autoconf automake libtool intltool - BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: poppler-glib-devel >= %{poppler_version} @@ -32,14 +27,12 @@ BuildRequires: libjpeg-devel BuildRequires: libspectre-devel BuildRequires: gnome-doc-utils BuildRequires: scrollkeeper -BuildRequires: dbus-glib-devel >= %{dbus_version} BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gnome-icon-theme >= %{theme_version} BuildRequires: libtool BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: GConf2-devel BuildRequires: t1lib-devel # for the nautilus properties page @@ -49,12 +42,6 @@ BuildRequires: kpathsea-devel # for the djvu backend BuildRequires: djvulibre-devel -# for /etc/gconf/schemas -Requires: GConf2 - -Requires(pre): GConf2 -Requires(post): GConf2 -Requires(preun): GConf2 Requires: %{name}-libs = %{version}-%{release} %description @@ -117,12 +104,12 @@ It adds an additional tab called "Document" to the file properties dialog. %prep %setup -q %patch2 -p1 -b .t1font-map -%patch3 -p1 -b .settings-migration - -autoreconf -i -f %build -%configure --disable-static --disable-scrollkeeper --disable-schemas-install \ +%configure \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-install \ --enable-comics=yes \ --enable-dvi=yes \ --enable-djvu=yes \