diff --git a/.gitignore b/.gitignore index 275c8ac..494b850 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ caribou-0.1.5.tar.bz2 +/caribou-0.1.7.tar.bz2 diff --git a/caribou.spec b/caribou.spec index 2f169ef..19e6083 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.7 +Release: 1%{?dist} Summary: A simplified in-place on-screen keyboard Group: User Interface/Desktops @@ -15,7 +13,7 @@ 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: pyclutter-devel BuildRequires: pyatspi BuildRequires: python-virtkey @@ -23,6 +21,7 @@ BuildRequires: intltool BuildRequires: gnome-doc-utils BuildRequires: desktop-file-utils BuildRequires: GConf2-devel +BuildRequires: gettext Requires: pygtk2 Requires: gnome-python2-gconf @@ -44,28 +43,29 @@ 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 +%post +%gconf_schema_upgrade caribou + %preun %gconf_schema_remove caribou %files -f caribou.lang %defattr(-,root,root,-) -%doc COPYING README +%doc README NEWS COPYING README %{python_sitelib}/caribou %{_bindir}/caribou %{_datadir}/caribou @@ -73,6 +73,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/caribou.desktop %{_sysconfdir}/gconf/schemas/caribou.schemas %changelog +* Thu Mar 10 2011 Parag Nemade - 0.1.7-1 +- Update to 0.1.7 + * Tue Feb 08 2011 Fedora Release Engineering - 0.1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 74ef59b..d0a605f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -489e1ee7041664777adf69be7fbb4141 caribou-0.1.5.tar.bz2 +609287e77fe0de82362aa1ea42b40ab8 caribou-0.1.7.tar.bz2