rpms/gucharmap/devel .cvsignore, 1.26, 1.27 gucharmap.spec, 1.48, 1.49 sources, 1.27, 1.28

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1090

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.30



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	11 Mar 2010 23:38:26 -0000	1.26
+++ .cvsignore	29 Mar 2010 15:04:50 -0000	1.27
@@ -1 +1 @@
-gucharmap-2.29.92.tar.bz2
+gucharmap-2.30.0.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gucharmap.spec	11 Mar 2010 23:38:27 -0000	1.48
+++ gucharmap.spec	29 Mar 2010 15:04:50 -0000	1.49
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.29.92
+Version:        2.30.0
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -12,7 +12,7 @@ License:        GPLv2+ and GFDL and MIT
 # GPL for the source code, GFDL for the docs, MIT for Unicode data
 URL:            http://live.gnome.org/Gucharmap
 #VCS: git:git://git.gnome.org/gucharmap
-Source:         http://download.gnome.org/sources/gucharmap/2.29/gucharmap-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gucharmap/2.30/gucharmap-%{version}.tar.bz2
 
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -23,9 +23,7 @@ BuildRequires: scrollkeeper
 BuildRequires: gettext
 BuildRequires: intltool
 
-Requires(post):scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 %description
@@ -92,24 +90,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /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
-fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gucharmap.schemas > /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %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
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
 %pre
 if [ "$1" -gt 1 -a -f %{_sysconfdir}/gconf/schemas/gucharmap.schemas ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -141,6 +136,9 @@ fi
 
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
 * Thu Mar 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.29.92-1
 - Update to 2.29.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	11 Mar 2010 23:38:27 -0000	1.27
+++ sources	29 Mar 2010 15:04:50 -0000	1.28
@@ -1 +1 @@
-bf9ace30cdfb54a702924324a0612929  gucharmap-2.29.92.tar.bz2
+8b16004ad18cf59afe95cfeea7b855b1  gucharmap-2.30.0.tar.bz2