rpms/evince/devel evince.spec,1.201,1.202

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14664

Modified Files:
	evince.spec 
Log Message:
2.31.2



Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- evince.spec	22 May 2010 00:38:13 -0000	1.201
+++ evince.spec	27 May 2010 20:16:52 -0000	1.202
@@ -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.or
 # 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 "Docume
 %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 \