From 635b333819ad8d4b28349babcb7de1c1f9b406e4 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: May 06 2011 22:46:30 +0000
Subject: Merge branch 'master' into f15


Conflicts:
	.gitignore
	caribou.spec

---

diff --git a/caribou.spec b/caribou.spec
index af2fc85..e9bfc17 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -2,7 +2,7 @@
 
 Name:           caribou
 Version:        0.2.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simplified in-place on-screen keyboard
 
 Group:          User Interface/Desktops
@@ -53,13 +53,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/caribou-autost
 %find_lang caribou
 
 %postun
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
-%post
-if [ $1 -eq 1 ] ; then
+if [ $1 -eq 0 ] ; then
     glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 %files -f caribou.lang
 %defattr(-,root,root,-)
 %doc NEWS COPYING README
@@ -71,6 +71,9 @@ fi
 %{_datadir}/glib-2.0/schemas
 
 %changelog
+* Fri May  6 2011 Christopher Aillon <caillon@redhat.com> - 0.2.00-3
+- Update scriptlets per packaging guidelines
+
 * Thu May 05 2011 Parag Nemade <pnemade AT redhat.com> - 0.2.00-2
 - Caribou now only be shown in GNOME. (rh#698603)
 - Add desktop-file-validate for caribou-autostart.desktop