rpms/gedit/devel .cvsignore, 1.98, 1.99 gedit.spec, 1.208, 1.209 sources, 1.100, 1.101

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16939

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.29.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- .cvsignore	1 Dec 2009 14:55:54 -0000	1.98
+++ .cvsignore	13 Jan 2010 21:18:18 -0000	1.99
@@ -1 +1 @@
-gedit-2.29.3.tar.bz2
+gedit-2.29.4.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- gedit.spec	4 Dec 2009 03:53:44 -0000	1.208
+++ gedit.spec	13 Jan 2010 21:18:18 -0000	1.209
@@ -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 at redhat.com> - 1:2.29.4-1
+- Update to 2.29.4
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.29.3-3
 - Don't ship .la files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- sources	1 Dec 2009 14:55:54 -0000	1.100
+++ sources	13 Jan 2010 21:18:18 -0000	1.101
@@ -1 +1 @@
-51e58d48e99862899a93d6aea4afc7b0  gedit-2.29.3.tar.bz2
+a806f9bd1dfafc4b655aec3a34133a03  gedit-2.29.4.tar.bz2