[caribou/f15/master] Update to 0.1.91

pnemade pnemade at fedoraproject.org
Thu Mar 10 06:33:01 UTC 2011


commit 6896429f40d990808cffc0ded0d2b5a75116d395
Author: Parag Nemade <pnemade at fedoraproject.org>
Date:   Thu Mar 10 06:32:51 2011 +0530

    Update to 0.1.91

 .gitignore   |    1 +
 caribou.spec |   27 ++++++++++++---------------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 494b850..51eca9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 caribou-0.1.5.tar.bz2
 /caribou-0.1.7.tar.bz2
+/caribou-0.1.91.tar.bz2
diff --git a/caribou.spec b/caribou.spec
index 19e6083..698a986 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           caribou
-Version:        0.1.7
+Version:        0.1.91
 Release:        1%{?dist}
 Summary:        A simplified in-place on-screen keyboard
 
@@ -14,13 +14,13 @@ BuildArch:      noarch
 
 BuildRequires:  python-devel
 BuildRequires:  gtk3-devel
+BuildRequires:  pygobject2-devel
 BuildRequires:  pyclutter-devel
 BuildRequires:  pyatspi
 BuildRequires:  python-virtkey
 BuildRequires:  intltool
 BuildRequires:  gnome-doc-utils
 BuildRequires:  desktop-file-utils
-BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 
 Requires:       pygtk2
@@ -29,10 +29,6 @@ Requires:       pyatspi
 Requires:       pyclutter
 Requires:       python-virtkey
 
-Requires(pre):  GConf2
-Requires(post):  GConf2
-Requires(preun):  GConf2
-
 %description
 Caribou is a text entry application that currently manifests itself as
 a simplified in-place on-screen keyboard.
@@ -46,7 +42,6 @@ a simplified in-place on-screen keyboard.
 make %{?_smp_mflags}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/caribou.desktop
@@ -54,25 +49,27 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/caribou.desktop
 
 %find_lang caribou
 
-%pre
-%gconf_schema_prepare caribou
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %post
-%gconf_schema_upgrade caribou
-
-%preun
-%gconf_schema_remove caribou
+if [ $1 -eq 1 ] ; then
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
 %files -f caribou.lang
 %defattr(-,root,root,-)
-%doc README NEWS COPYING README
+%doc NEWS COPYING README
 %{python_sitelib}/caribou
 %{_bindir}/caribou
 %{_datadir}/caribou
 %{_datadir}/applications/caribou.desktop
-%{_sysconfdir}/gconf/schemas/caribou.schemas
+%{_datadir}/glib-2.0/schemas
 
 %changelog
+* Thu Mar 10 2011 Parag Nemade <pnemade AT redhat.com> - 0.1.91-1
+- Update to 0.1.91
+
 * Thu Mar 10 2011 Parag Nemade <pnemade AT redhat.com> - 0.1.7-1
 - Update to 0.1.7
 
diff --git a/sources b/sources
index d0a605f..b3366b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-609287e77fe0de82362aa1ea42b40ab8  caribou-0.1.7.tar.bz2
+f4fb5b674c4c7b565fc59951c3f0d117  caribou-0.1.91.tar.bz2


More information about the scm-commits mailing list