[libgnomekbd/f17] 3.4.0.1

[Kalev Lember]

commit a7324513bdc2f58044fa2eedea9616a94ace6a9b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 27 00:59:39 2012 +0300

    3.4.0.1
    
    - Obsolete the -capplet subpackage; the whole plugins architecture is
      removed from libgnomekbd

 .gitignore       |    1 +
 libgnomekbd.spec |   32 ++++++++------------------------
 sources          |    2 +-
 3 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17d6d22..c11d628 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ libgnomekbd-2.31.5.tar.bz2
 /libgnomekbd-3.1.92.tar.xz
 /libgnomekbd-3.2.0.tar.xz
 /libgnomekbd-3.3.90.tar.xz
+/libgnomekbd-3.4.0.1.tar.xz
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 92fbcb4..92d4ee2 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,5 +1,5 @@
 Name:           libgnomekbd
-Version:        3.3.90
+Version:        3.4.0.1
 Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
@@ -7,7 +7,7 @@ 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/3.3/libgnomekbd-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/libgnomekbd/3.4/libgnomekbd-%{version}.tar.xz
 
 BuildRequires:  gtk3-devel >= 3.0.0
 BuildRequires:  cairo-devel
@@ -20,6 +20,7 @@ BuildRequires:  GConf2-devel
 BuildRequires:  gobject-introspection-devel
 
 Requires(post): GConf2
+Obsoletes:      libgnomekbd-capplet < 3.3.90-2
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -38,17 +39,6 @@ The libgnomekbd-devel package contains libraries and header files for
 developing applications that use libgnomekbd.
 
 
-%package        capplet
-Summary:        A configuration applet to select libgnomekbd plugins
-Group:          User Interface/Desktops
-Requires:       %{name} = %{version}-%{release}
-
-%description    capplet
-The libgnomekbd-capplet package contains a configuration applet to
-select libgnomekbd plugins. These plugins can modify the appearance
-of the keyboard indicator applet.
-
-
 %prep
 %setup -q
 
@@ -64,11 +54,6 @@ 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
 
 desktop-file-install --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -114,14 +99,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/pkgconfig/*
 %{_datadir}/gir-1.0/Gkbd-3.0.gir
 
-%files capplet
-%defattr(-,root,root,-)
-%{_bindir}/gkbd-indicator-plugins-capplet
-%{_datadir}/applications/gnome-gkbd-indicator-plugins-capplet.desktop
-
-
 
 %changelog
+* Tue Mar 27 2012 Kalev Lember <kalevlember at gmail.com> - 3.4.0.1-1
+- Update to 3.4.0.1
+- Obsolete the -capplet subpackage; the whole plugins architecture is
+  removed from libgnomekbd
+
 * Fri Feb 25 2012 Matthias Clasen <mclasen at redhat.com> - 3.3.90-1
 - Update to 3.3.90
 
diff --git a/sources b/sources
index 6c18395..92813a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c12f61c258c57ee2397421f62dc64eae  libgnomekbd-3.3.90.tar.xz
+f23958a75a672ab5c3a1783df275252f  libgnomekbd-3.4.0.1.tar.xz