rpms/gconf-editor/F-13 gconf-editor.spec,1.73,1.74

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gconf-editor/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29104

Modified Files:
	gconf-editor.spec 
Log Message:
2.29.92



Index: gconf-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gconf-editor/F-13/gconf-editor.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- gconf-editor.spec	22 Sep 2009 04:40:16 -0000	1.73
+++ gconf-editor.spec	11 Mar 2010 23:04:16 -0000	1.74
@@ -7,19 +7,17 @@
 
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
-Version: 2.28.0
+Version: 2.29.92
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gconf-editor/2.28/%{name}-%{version}.tar.bz2
+#VCS: git:git://git.gnome.org/gconf-editor
+Source0: http://download.gnome.org/sources/gconf-editor/2.29/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: Applications/System
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
 
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -65,14 +63,10 @@ desktop-file-install --vendor gnome --de
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gconf-editor.schemas > /dev/null || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor >& /dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -87,12 +81,13 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-scrollkeeper-update -q
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+  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)
 %doc AUTHORS NEWS README COPYING
@@ -105,6 +100,9 @@ fi
 %dir %{_datadir}/omf/gconf-editor
 
 %changelog
+* Thu Mar 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.29.92-1
+- Update to 2.29.92
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0