From 2b72ac4ff4d50d21172652413c55aabd41c14ee0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 27 Apr 2010 00:05:29 +0000
Subject: [PATCH] 2.30.1

---
 .cvsignore       |  2 +-
 libgnomekbd.spec | 25 +++++++++----------------
 sources          |  2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 28d81b1..14b36d1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libgnomekbd-2.30.0.tar.bz2
+libgnomekbd-2.30.1.tar.bz2
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index a5ea2ee..a57eba5 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:        2.30.0
-Release:        2%{?dist}
+Version:        2.30.1
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -8,8 +8,6 @@ License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
 # VCS: git:git://git.gnome.org/libgnomekbd
 Source0:        http://download.gnome.org/sources/libgnomekbd/2.30/libgnomekbd-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=615077
-Patch0:         fontsize.patch
 
 BuildRequires:  dbus-devel >= 0.92
 BuildRequires:  dbus-glib >= 0.34
@@ -62,7 +60,6 @@ of the keyboard indicator applet.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fontsize
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -70,7 +67,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -87,23 +83,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas >& /dev/null || :
+%gconf_schema_upgrade desktop_gnome_peripherals_keyboard_xkb
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas >& /dev/null || :
-fi
+%gconf_schema_prepare desktop_gnome_peripherals_keyboard_xkb
 
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas >& /dev/null || :
-fi
+%gconf_schema_remove desktop_gnome_peripherals_keyboard_xkb
 
 
 %postun
@@ -136,6 +125,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Mon Apr 26 2010 Matthias Clasen <mclasen@redhat.com> 2.30.1-1
+- Update to 2.30.1
+- Spec file cleanups
+
 * Wed Apr  7 2010 Matthias Clasen <mclasen@redhat.com> 2.30.0-2
 - Fix an invalid schema default
 
diff --git a/sources b/sources
index c1b8263..3755afc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c3a2dfac0da5c3748a06db905264429  libgnomekbd-2.30.0.tar.bz2
+9b828a4e35089d91b9ea16ddf981ff28  libgnomekbd-2.30.1.tar.bz2