rpms/gnome-utils/devel .cvsignore, 1.77, 1.78 gnome-utils.spec, 1.205, 1.206 sources, 1.82, 1.83

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9180

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.29.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	22 Sep 2009 02:52:01 -0000	1.77
+++ .cvsignore	17 Jan 2010 03:57:06 -0000	1.78
@@ -1 +1 @@
-gnome-utils-2.28.0.tar.bz2
+gnome-utils-2.29.5.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- gnome-utils.spec	25 Nov 2009 01:06:09 -0000	1.205
+++ gnome-utils.spec	17 Jan 2010 03:57:06 -0000	1.206
@@ -8,18 +8,17 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.28.1
-Release:        4%{?dist}
+Version:        2.29.5
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
 Group:          Applications/System
 License:        GPLv2+
 URL: 	        http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gnome-utils/2.28/gnome-utils-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gnome-utils/2.29/gnome-utils-%{version}.tar.bz2
 
 Patch0:		spinner.patch
-Patch1:		0001-gsearchtool-Backport-the-version-fix.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=597435
 Patch2:		selfshot.patch
 
@@ -41,13 +40,10 @@ BuildRequires:  intltool
 BuildRequires:  gnome-common
 BuildRequires:	automake autoconf libtool
 
-Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 Requires(pre): GConf2 >= 2.14
-
-Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 # obsolete the standalone baobab package from Extras
@@ -65,7 +61,6 @@ Group: Development/Libraries
 Requires:  gnome-utils = %{epoch}:%{version}-%{release}
 Requires:  glib2-devel >= %{glib2_version}
 Requires:  gtk2-devel >= %{gtk2_version}
-Requires:  pkgconfig
 
 %description devel
 The gnome-utils-devel package contains header files and other resources
@@ -91,13 +86,11 @@ view various system log files.
 %prep
 %setup -q
 %patch0 -p1 -b .spinner
-%patch1 -p1 -b .version
 %patch2 -p1 -b .selfshot
 
 # Hide from menus
 pushd gsearchtool
 rm gnome-search-tool.desktop
-rm gnome-search-tool.schemas
 echo "NoDisplay=true" >> gnome-search-tool.desktop.in
 popd
 
@@ -200,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-scrollkeeper-update -q
 update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
@@ -209,10 +201,7 @@ gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
 	%{_sysconfdir}/gconf/schemas/baobab.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
@@ -236,16 +225,16 @@ fi
 
 %postun
 /sbin/ldconfig
-scrollkeeper-update -q
 update-desktop-database -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
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolora >&/dev/null || :
 
 %post -n gnome-system-log
-scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas \
@@ -321,6 +310,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Sat Jan 16 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.29.5-1
+- Update to 2.29.5
+
 * Tue Nov 24 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-4
 - Avoid segfault with gnome-screenshot self-portraits (#541006)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	2 Nov 2009 05:00:21 -0000	1.82
+++ sources	17 Jan 2010 03:57:06 -0000	1.83
@@ -1 +1 @@
-3c811993191ae0bbf8666405a504288a  gnome-utils-2.28.1.tar.bz2
+37496aea7911c5597492c02625917ec0  gnome-utils-2.29.5.tar.bz2