2.30.0

.cvsignore

@@ -1 +1 @@
-libgnomekbd-2.29.92.tar.bz2
+libgnomekbd-2.30.0.tar.bz2

libgnomekbd.spec

@@ -1,13 +1,13 @@
 Name:           libgnomekbd
-Version:        2.29.92
+Version:        2.30.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
 # VCS: git:git://git.gnome.org/libgnomekbd
-Source0:        http://download.gnome.org/sources/libgnomekbd/2.28/libgnomekbd-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libgnomekbd/2.30/libgnomekbd-%{version}.tar.bz2
 
 BuildRequires:  dbus-devel >= 0.92
 BuildRequires:  dbus-glib >= 0.34
@@ -26,8 +26,6 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=613842
-Patch0: libgnomekbd-style-ref.patch
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -62,7 +60,6 @@ of the keyboard indicator applet.
 
 %prep
 %setup -q
-%patch0 -p1 -b .style-ref
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -89,8 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 /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 || :
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %pre
@@ -109,9 +105,13 @@ fi
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ]; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -133,6 +133,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> 2.30.0-1
+- Update to 2.30.0
+
 * Wed Mar 24 2010 Matthias Clasen <mclasen@redhat.com> 2.29.92-2
 - Fix a crash in the keyboard indicator
 

sources

@@ -1 +1 @@
-b46e70476891a92c4c8b4bbe84a59dc7  libgnomekbd-2.29.92.tar.bz2
+2c3a2dfac0da5c3748a06db905264429  libgnomekbd-2.30.0.tar.bz2