rpms/gucharmap/F-13 gucharmap.spec,1.49,1.50 sources,1.28,1.29

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18581

Modified Files:
	gucharmap.spec sources 
Log Message:
2.30.1



Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-13/gucharmap.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gucharmap.spec	29 Mar 2010 15:52:50 -0000	1.49
+++ gucharmap.spec	27 Apr 2010 02:51:45 -0000	1.50
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.30.0
+Version:        2.30.1
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -91,8 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 update-desktop-database -q
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gucharmap.schemas > /dev/null || :
+%gconf_schema_upgrade gucharmap
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %postun
@@ -106,16 +105,10 @@ fi
 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`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gucharmap.schemas > /dev/null || :
-fi
+%gconf_schema_prepare gucharmap
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gucharmap.schemas > /dev/null || :
-fi
+%gconf_schema_remove gucharmap
 
 %files -f gucharmap.lang
 %defattr(-,root,root,-)
@@ -136,6 +129,9 @@ fi
 
 
 %changelog
+* Mon Apr 26 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.1-1
+- Update to 2.30.1
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-1
 - Update to 2.30.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-13/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	29 Mar 2010 15:52:50 -0000	1.28
+++ sources	27 Apr 2010 02:51:45 -0000	1.29
@@ -1 +1 @@
-8b16004ad18cf59afe95cfeea7b855b1  gucharmap-2.30.0.tar.bz2
+cd3b342fb75b4bd9df2327c247aa457b  gucharmap-2.30.1.tar.bz2