[libgnomekbd] - Update to 2.91.1 - Remove obsolete patches - Remove RPATH

[Richard Hughes]

commit 028248d9785460ee465b79d64e4f0d536e9c1d9e
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 6 16:55:29 2010 +0100

    - Update to 2.91.1
    - Remove obsolete patches
    - Remove RPATH

 .gitignore                                         |    1 +
 ...ndle-scenario-when-one-keycode-has-multip.patch |  282 --------------------
 0002-Improved-indicator-background-handling.patch  |   40 ---
 fontsize.patch                                     |   12 -
 libgnomekbd-style-ref.patch                        |   12 -
 libgnomekbd.spec                                   |   36 ++--
 libxklavier4.patch                                 |   12 -
 list-leak.patch                                    |   62 -----
 sources                                            |    2 +-
 9 files changed, 18 insertions(+), 441 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a748be8..9c5e62b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libgnomekbd-2.31.5.tar.bz2
 /libgnomekbd-2.32.0.tar.bz2
+/libgnomekbd-2.91.1.tar.bz2
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 7c6771e..a07caae 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,5 +1,5 @@
 Name:           libgnomekbd
-Version:        2.32.0
+Version:        2.91.1
 Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
@@ -9,20 +9,13 @@ URL:            http://gswitchit.sourceforge.net
 # VCS: git:git://git.gnome.org/libgnomekbd
 Source0:        http://download.gnome.org/sources/libgnomekbd/2.32/libgnomekbd-%{version}.tar.bz2
 
-BuildRequires:  dbus-devel
-BuildRequires:  dbus-glib
-BuildRequires:  GConf2-devel
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel > 2.90.0
 BuildRequires:  cairo-devel
 BuildRequires:  libxklavier-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
-
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-
+BuildRequires:  chrpath
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -57,6 +50,8 @@ of the keyboard indicator applet.
 
 %build
 %configure --disable-static --enable-compile-warnings=no
+#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -64,6 +59,9 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgnomekbdui.so.7.0.0
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gkbd-indicator-plugins-capplet
+
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   $RPM_BUILD_ROOT%{_datadir}/applications/gkbd-indicator-plugins-capplet.desktop
@@ -75,15 +73,7 @@ desktop-file-install --vendor gnome --delete-original       \
 /sbin/ldconfig
 %gconf_schema_upgrade desktop_gnome_peripherals_keyboard_xkb
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-
-%pre
-%gconf_schema_prepare desktop_gnome_peripherals_keyboard_xkb
-
-
-%preun
-%gconf_schema_remove desktop_gnome_peripherals_keyboard_xkb
-
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %postun
 /sbin/ldconfig
@@ -91,6 +81,7 @@ if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
@@ -99,8 +90,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB
 %{_libdir}/*.so.*
-%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/libgnomekbd
+%{_datadir}/glib-2.0/schemas/org.gnome.libgnomekbd*.gschema.xml
 
 %files devel
 %defattr(-,root,root,-)
@@ -115,6 +106,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Wed Oct 06 2010 Richard Hughes <rhughes at redhat.com> 2.91.1-1
+- Update to 2.91.1
+- Remove obsolete patches
+- Remove RPATH
+
 * Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> 2.32.0-1
 - Update to 2.32.0
 
diff --git a/sources b/sources
index 92accd3..bb8c25f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de32a6e3e3464b566eecdc4332bf34bd  libgnomekbd-2.32.0.tar.bz2
+978889f6ba1da4cc304254f30a5d4058  libgnomekbd-2.91.1.tar.bz2