From dcd4f951ee593a36a4e43a4f94adb4877ca0840d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 13 Jan 2010 21:18:18 +0000
Subject: [PATCH] 2.29.4

---
 .cvsignore |  2 +-
 gedit.spec | 24 ++++++++++++------------
 sources    |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3e95480..85f8155 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gedit-2.29.3.tar.bz2
+gedit-2.29.4.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index c5cd104..2a2cd0f 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -17,12 +17,12 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.29.3
-Release: 	3%{?dist}
+Version: 	2.29.4
+Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
-Source0:	http://download.gnome.org/sources/gedit/2.28/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/2.29/gedit-%{version}.tar.bz2
 
 URL:		http://projects.gnome.org/gedit/
 BuildRoot:	 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -178,15 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database -q
-scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null || :
 
 # update icon themes
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -204,12 +200,13 @@ fi
 
 %postun
 update-desktop-database -q
-scrollkeeper-update -q
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_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 || :
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -231,6 +228,9 @@ fi
 
 
 %changelog
+* Wed Jan 13 2010 Matthias Clasen <mclasen@redhat.com> - 1:2.29.4-1
+- Update to 2.29.4
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.29.3-3
 - Don't ship .la files
 
diff --git a/sources b/sources
index f28accd..34103be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51e58d48e99862899a93d6aea4afc7b0  gedit-2.29.3.tar.bz2
+a806f9bd1dfafc4b655aec3a34133a03  gedit-2.29.4.tar.bz2