[caribou] Update to 0.1.92

pnemade pnemade at fedoraproject.org
Tue Mar 22 05:48:16 UTC 2011


commit ba99185dc9963c79be793e513d89ea84d1a6ce5b
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Mar 22 11:17:56 2011 +0530

    Update to 0.1.92

 caribou.spec |   47 ++++++++++++++++++++++++++---------------------
 sources      |    2 +-
 2 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/caribou.spec b/caribou.spec
index 2f169ef..b490849 100644
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,10 +1,8 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
 %global debug_package %{nil}
 
 Name:           caribou
-Version:        0.1.5
-Release:        3%{?dist}
+Version:        0.1.92
+Release:        1%{?dist}
 Summary:        A simplified in-place on-screen keyboard
 
 Group:          User Interface/Desktops
@@ -15,14 +13,15 @@ Source0:        http://ftp.gnome.org/pub/GNOME/sources/caribou/0.1/caribou-%{ver
 BuildArch:      noarch
 
 BuildRequires:  python-devel
-BuildRequires:  pygtk2-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
 Requires:       gnome-python2-gconf
@@ -30,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.
@@ -44,35 +39,45 @@ a simplified in-place on-screen keyboard.
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+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
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/caribou.desktop
 
 %find_lang caribou
 
-%post
-%gconf_schema_upgrade caribou
-
-%pre
-%gconf_schema_prepare caribou
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-%preun
-%gconf_schema_remove caribou
+%post
+if [ $1 -eq 1 ] ; then
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
 %files -f caribou.lang
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc NEWS COPYING README
 %{python_sitelib}/caribou
 %{_bindir}/caribou
 %{_datadir}/caribou
 %{_datadir}/applications/caribou.desktop
-%{_sysconfdir}/gconf/schemas/caribou.schemas
+%{_sysconfdir}/xdg/autostart/caribou-autostart.desktop
+%{_datadir}/glib-2.0/schemas
 
 %changelog
+* Tue Mar 22 2011 Parag Nemade <pnemade AT redhat.com> - 0.1.92-1
+- Update to 0.1.92
+
+* 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
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 74ef59b..5ed1713 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-489e1ee7041664777adf69be7fbb4141  caribou-0.1.5.tar.bz2
+244298cf8caceb64a76f2ef887cb5322  caribou-0.1.92.tar.bz2


More information about the scm-commits mailing list