From 4d8d022c6e74e85560bd7665ea069f2551d9446a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 29 Mar 2010 20:09:59 +0000
Subject: [PATCH] 2.30.0

---
 .cvsignore  |  2 +-
 evince.spec | 25 ++++++++++++-------------
 sources     |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 697bb87..58c3a89 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evince-2.29.92.tar.bz2
+evince-2.30.0.tar.bz2
diff --git a/evince.spec b/evince.spec
index 2741e0c..eff95a4 100644
--- a/evince.spec
+++ b/evince.spec
@@ -5,14 +5,14 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.29.92
+Version:	2.30.0
 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}/2.29/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=455759
 # Patch1:		duplex-copies.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
@@ -51,9 +51,7 @@ Requires: GConf2
 
 Requires(pre): GConf2
 Requires(post): GConf2
-Requires(post): scrollkeeper
 Requires(preun): GConf2
-Requires(postun): scrollkeeper
 Requires: %{name}-libs = %{version}-%{release}
 
 %description
@@ -179,12 +177,8 @@ gconftool-2 --makefile-install-rule \
 		>/dev/null || :
 
 update-desktop-database &> /dev/null ||:
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -204,13 +198,15 @@ fi
 
 %postun
 update-desktop-database &> /dev/null ||:
-scrollkeeper-update -q || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
 %postun libs -p /sbin/ldconfig
 
 %files -f evince.lang
@@ -266,6 +262,9 @@ fi
 %{_libdir}/evince/2/backends/djvudocument.evince-backend
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
 * Thu Mar 11 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.92-1
 - Update to 2.29.92
 
diff --git a/sources b/sources
index f64d59d..33cdd52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d8398caf457854f853ebb03ebe55d5a  evince-2.29.92.tar.bz2
+a55f1997891a64157286b6f6b00f8458  evince-2.30.0.tar.bz2