rpms/gnome-media/devel gnome-media.spec,1.183,1.184

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-media.spec 
Log Message:
2.28.5



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- gnome-media.spec	7 Oct 2009 10:02:38 -0000	1.183
+++ gnome-media.spec	17 Jan 2010 04:17:21 -0000	1.184
@@ -1,5 +1,3 @@
-%define _default_patch_fuzz 2
-
 %define glib2_version 2.4.0
 %define pango_version 1.4.0
 %define gtk2_version 2.10.0
@@ -13,14 +11,12 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.28.1
+Version:        2.28.5
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes:      gnome
 URL:            http://www.gnome.org
 ExcludeArch:    s390 s390x
 
@@ -55,7 +51,6 @@ Requires: %{name}-libs = %{version}-%{re
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: libgnome-devel >= %{libgnome_version}
 Requires: libgnomeui-devel >= %{libgnomeui_version}
-Requires: pkgconfig
 
 %description devel
 This package contains the libraries and header files necessary to
@@ -156,20 +151,14 @@ cat gstreamer-properties.lang >> apps.la
 rm -rf $RPM_BUILD_ROOT
 
 %post
-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 || :
 
 %post apps
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
     > /dev/null || :
-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 || :
 
 %post libs
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -259,19 +248,25 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-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 --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
 %postun libs -p /sbin/ldconfig
 
 %postun apps
-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 --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
+
+%posttrans apps
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
+
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING NEWS README
@@ -311,6 +306,11 @@ fi
 
 
 %changelog
+* Sat Jan 16 2010 Matthias Clasen <mclasen at redhat.com>  2.18.5-1
+- Update to 2.18.5
+- Drop an obsolete Obsoletes
+- Various spec file cleanups
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1