[evince] Remove evince-CVE-2010-2640_CVE-2010-2641_CVE-2010-2642_CVE-2010-2643.patch Change the way thumbnail

[mkasik]

commit 9606608904c8b62186e2f69df126e728a8ed51d1
Author: Marek Kasik <mkasik at redhat.com>
Date:   Wed Jan 12 13:28:06 2011 +0100

    Remove evince-CVE-2010-2640_CVE-2010-2641_CVE-2010-2642_CVE-2010-2643.patch
    Change the way thumbnailer is integrated with system

 ...CVE-2010-2641_CVE-2010-2642_CVE-2010-2643.patch |   96 --------------------
 evince.spec                                        |   25 ++----
 2 files changed, 6 insertions(+), 115 deletions(-)
---
diff --git a/evince.spec b/evince.spec
index cace9b6..f94be96 100644
--- a/evince.spec
+++ b/evince.spec
@@ -5,7 +5,7 @@
 
 Name:           evince
 Version:        2.91.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GFDL
@@ -15,9 +15,6 @@ Source0:        http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
 Patch2:         evince-t1font-mapping.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=667573
-Patch3:         evince-CVE-2010-2640_CVE-2010-2641_CVE-2010-2642_CVE-2010-2643.patch
-
 BuildRequires:  gtk3-devel
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  poppler-glib-devel >= %{poppler_version}
@@ -113,7 +110,6 @@ It adds an additional tab called "Document" to the file properties dialog.
 %prep
 %setup -q
 %patch2 -p1 -b .t1font-map
-%patch3 -p1 -b .CVE-2010-2640_CVE-2010-2641_CVE-2010-2642_CVE-2010-2643
 
 %build
 automake
@@ -153,25 +149,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 
-%pre
-%gconf_schema_prepare evince-thumbnailer evince-thumbnailer-ps
-%gconf_schema_prepare evince-thumbnailer-comics evince-thumbnailer-djvu
-%gconf_schema_prepare evince-thumbnailer-dvi
-
 %post
-%gconf_schema_upgrade evince-thumbnailer evince-thumbnailer-ps
-%gconf_schema_upgrade evince-thumbnailer-comics evince-thumbnailer-djvu
-%gconf_schema_upgrade evince-thumbnailer-dvi
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %post libs -p /sbin/ldconfig
 
-%preun
-%gconf_schema_remove evince-thumbnailer evince-thumbnailer-ps
-%gconf_schema_remove evince-thumbnailer-comics evince-thumbnailer-djvu
-%gconf_schema_remove evince-thumbnailer-dvi
-
 %postun
 update-desktop-database &> /dev/null ||:
 if [ $1 -eq 0 ]; then
@@ -189,7 +172,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %files -f evince.lang
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/evince.*
@@ -198,6 +180,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml
 %{_datadir}/GConf/gsettings/evince.convert
+%{_datadir}/thumbnailers/evince.thumbnailer
 
 %files libs
 %defattr(-,root,root,-)
@@ -247,6 +230,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_libdir}/nautilus/extensions-3.0/libevince-properties-page.so
 
 %changelog
+* Wed Jan 12 2011 Marek Kasik <mkasik at redhat.com> - 2.91.5-2
+- Remove evince-CVE-2010-2640_CVE-2010-2641_CVE-2010-2642_CVE-2010-2643.patch
+- Change the way thumbnailer is integrated with system
+
 * Tue Jan 11 2011 Matthias Clasen <mclasen at redhat.com> 2.91.5-1
 - Update to 2.91.5