[onboard] * Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.93.0-3 - Fix the build and th

Mon Aug 2 00:14:49 UTC 2010

commit aab8e2a052a8c69f1888290a7a2a3d05f2bc2c49
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Aug 1 20:14:45 2010 -0400

    * Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.93.0-3
    - Fix the build and the scriptlets

 onboard-norequires.patch |   11 ++++++++
 onboard-settings.desktop |   11 --------
 onboard-setup.patch      |   19 ++++++++++++++
 onboard.desktop          |   11 --------
 onboard.spec             |   59 ++++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 82 insertions(+), 29 deletions(-)
---

diff --git a/onboard-norequires.patch b/onboard-norequires.patch
new file mode 100644
index 0000000..1e1997d
--- /dev/null
+++ b/onboard-norequires.patch
@@ -0,0 +1,11 @@
+diff -rupN onboard-0.93.0.old/setup.py onboard-0.93.0/setup.py
+--- onboard-0.93.0.old/setup.py	2010-02-17 13:27:52.000000000 -0500
++++ onboard-0.93.0/setup.py	2010-08-01 19:08:08.000000000 -0400
+@@ -14,6 +14,7 @@ required_ver = version.StrictVersion('2.
+ assert current_ver >= required_ver , 'needs DistUtilsExtra.auto >= 2.12'
+ 
+ DistUtilsExtra.auto.setup(
++    requires = [],
+     name = 'onboard',
+     version = '0.93.0',
+     author = 'Chris Jones',
diff --git a/onboard-setup.patch b/onboard-setup.patch
new file mode 100644
index 0000000..eb507f9
--- /dev/null
+++ b/onboard-setup.patch
@@ -0,0 +1,19 @@
+diff -rupN onboard-0.93.0.old/setup.cfg onboard-0.93.0/setup.cfg
+--- onboard-0.93.0.old/setup.cfg	1969-12-31 19:00:00.000000000 -0500
++++ onboard-0.93.0/setup.cfg	2010-08-01 19:20:17.000000000 -0400
+@@ -0,0 +1,4 @@
++[build_i18n]
++domain=onboard
++desktop_files=[("share/applications", ("data/onboard.desktop.in",))]
++desktop_files=[("share/applications", ("data/onboard-settings.desktop.in",))]
+diff -rupN onboard-0.93.0.old/setup.py onboard-0.93.0/setup.py
+--- onboard-0.93.0.old/setup.py	2010-02-17 13:27:52.000000000 -0500
++++ onboard-0.93.0/setup.py	2010-08-01 19:20:30.000000000 -0400
+@@ -27,6 +27,7 @@ DistUtilsExtra.auto.setup(
+     packages = ['Onboard'],
+ 
+     data_files = [('share/gconf/schemas', glob.glob('data/*.schemas')),
++                  ('share/applications', glob.glob('build/share/applications/*.desktop')),
+                   ('share/onboard', glob.glob('AUTHORS')),
+                   ('share/onboard', glob.glob('CHANGELOG')),
+                   ('share/onboard', glob.glob('COPYING')),
diff --git a/onboard.spec b/onboard.spec
index 9b3e3f1..e09e21f 100644
--- a/onboard.spec
+++ b/onboard.spec
@@ -2,33 +2,48 @@
 
 Name:           onboard
 Version:        0.93.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple on-screen Keyboard
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            https://launchpad.net/onboard/
 Source0:        http://launchpad.net/%{name}/0.93/%{version}/+download/%{name}-%{version}.tar.gz
+# This is required to not initialize objects of the required libraries. Otherwise
+# the setup needs a running X session
+Patch0:         onboard-norequires.patch
+# To build the .desktop files. This can be upstreamed:
+Patch1:         onboard-setup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
+BuildRequires:  gnome-python2-gconf
 BuildRequires:  pygtk2-devel
+BuildRequires:  python-distutils-extra
+BuildRequires:  intltool
 BuildRequires:  python-setuptools
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 
+Requires:       hicolor-icon-theme
 Requires:       pycairo
 Requires:       python-virtkey
 
+BuildRequires:  GConf2
+Requires(pre):  GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 
 %description
 An on-screen keyboard useful on tablet PCs or for mobility impaired users.
 
 
 %prep
-%setup -q -c
-
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -38,9 +53,13 @@ An on-screen keyboard useful on tablet PCs or for mobility impaired users.
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 #fix wrong permissons
-for file in %{buildroot}%{python_sitelib}/Onboard/{settings,settings-dialog,Keyboard,utils}.py; do
+chmod a+x %{buildroot}%{_datadir}/onboard/layoutstrings.py
+for file in %{buildroot}%{python_sitelib}/Onboard/{settings,IconPalette,KeyboardSVG,utils}.py; do
    chmod a+x $file
 done
+
+
+mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install                                    \
     --remove-category="X-GNOME-PersonalSettings"        \
     --add-category="Utility;"                           \
@@ -51,19 +70,39 @@ desktop-file-install                                    \
     --add-category="Utility;"                           \
     --dir=%{buildroot}%{_datadir}/applications          \
     %{buildroot}%{_datadir}/applications/%{name}-settings.desktop
+
+mkdir %{buildroot}%{_datadir}/locale
+cp -a build/mo/* %{buildroot}%{_datadir}/locale
 %find_lang %{name}
 
+# Move schemas to the correct location
+mkdir %{buildroot}/%{_sysconfdir}
+mv %{buildroot}/%{_datadir}/gconf/ %{buildroot}/%{_sysconfdir}/
+
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+%gconf_schema_prepare onboard
 
 %post
-update-mime-database %{_datadir}/mime &> /dev/null || :
+%gconf_schema_upgrade onboard
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
 
+%preun
+%gconf_schema_remove onboard
 
 %postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+update-desktop-database &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
@@ -74,11 +113,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}-settings.desktop
+%{_sysconfdir}/gconf/schemas/onboard.schemas
+%{_datadir}/icons/hicolor/scalable/apps/onboard.svg
+%{_datadir}/icons/hicolor/scalable/apps/onboard2.svg
 %{python_sitelib}/Onboard/
 %{python_sitelib}/%{name}*.egg-info
 
 
 %changelog
+* Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.93.0-3
+- Fix the build and the scriptlets
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.93.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
