[caribou/f18] Resolves:rh#879672 - missing(?) dependency to caribou-gtk3-module

[pnemade]

commit b8e3ebaaaa3808f1ebf0610725506e03721b1893
Author: Parag Nemade <pnemade at redhat.com>
Date:   Wed Dec 19 20:43:04 2012 +0530

    Resolves:rh#879672 - missing(?) dependency to caribou-gtk3-module
    
    - Add missing gconf schema scriptlet for -antler

 caribou.spec |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)
---
diff --git a/caribou.spec b/caribou.spec
index 6e84bfb..91b1aa6 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,9 +1,7 @@
 Name:           caribou
 Version:        0.4.4.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A simplified in-place on-screen keyboard
-
-Group:          User Interface/Desktops
 License:        LGPLv2+
 URL:            http://live.gnome.org/Caribou
 Source0:        http://download.gnome.org/sources/caribou/0.4/caribou-%{version}.tar.xz
@@ -27,6 +25,8 @@ BuildRequires:  gobject-introspection-devel
 
 Requires:       python-%{name} = %{version}-%{release}
 Requires:       gobject-introspection
+Requires:       caribou-gtk2-module
+Requires:       caribou-gtk3-module
 
 #Following is needed as package moved from noarch to arch
 Obsoletes:      caribou < 0.4.1-3
@@ -39,8 +39,7 @@ a simplified in-place on-screen keyboard.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 # Obsolete retired 'gok' to make sure it gets removed with distro upgrade
 Obsoletes:      gok-devel < 2.30.1-6
 
@@ -50,7 +49,6 @@ developing applications that use %{name}.
 
 %package     -n python-caribou
 Summary:        Keyboard UI for %{name}
-Group:          System Environment/Libraries
 Requires:       pygobject3
 Requires:       pyatspi
 Requires:       %{name} = %{version}-%{release}
@@ -61,31 +59,29 @@ BuildArch:      noarch
 This package contains caribou python GUI
 
 %package        gtk2-module
-Summary:        Gtk2 im module for %{name}
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:        Gtk2 module for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Obsoletes:      caribou < 0.4.1-3
 
 %description    gtk2-module
-This package contains caribou im module for gtk2
+This package contains caribou module for gtk2 applications.
 
 %package        gtk3-module
-Summary:        Gtk3 im module for %{name}
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:        Gtk3 module for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Obsoletes:      caribou < 0.4.1-3
 
 %description    gtk3-module
-This package contains caribou im module for gtk3
+This package contains caribou module for gtk3 applications.
 
 %package        antler
 Summary:        Keyboard implementation for %{name}
-Group:          User Interface/Desktops
 Requires:       python-%{name} = %{version}-%{release}
 Obsoletes:      caribou < 0.4.1-3
 
 %description    antler
-This package contains caribou keyboard implementation
+This package contains caribou keyboard implementation for
+non-gnome-shell sessions.
 
 %prep
 %setup -q
@@ -112,11 +108,19 @@ desktop-file-validate $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-mo
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%postun antler
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+
+%posttrans antler
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f caribou.lang
 %doc NEWS COPYING README
@@ -152,6 +156,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Wed Dec 19 2012 Parag Nemade <pnemade AT redhat DOT com> - 0.4.4.2-7
+- Resolves:rh#879672 - missing(?) dependency to caribou-gtk3-module
+- Add missing gconf schema scriptlet for -antler
+
 * Wed Nov 21 2012 Parag Nemade <pnemade AT redhat DOT com> - 0.4.4.2-6
 - Resolves:rh#878716 - need some spec cleanup