[akonadi] %check: try harder to make work in mock (using xvfb) default to sqlite on 'small' platforms (arm)

[Rex Dieter]

commit 4b50532fddf324db3426a12c26e924bc5554b4eb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Dec 31 09:05:33 2011 -0600

    %check: try harder to make work in mock (using xvfb)
    default to sqlite on 'small' platforms (arm)

 akonadi.spec |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/akonadi.spec b/akonadi.spec
index ae77608..179bf77 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,11 +1,15 @@
 
 ## Can be either MYSQL(uptsream default), SQLITE, or POSTGRES(untested)
+%ifarch %{arm}
+%global database_backend SQLITE
+%else
 %global database_backend MYSQL 
+%endif
 
 Summary: PIM Storage Service
 Name:    akonadi
 Version: 1.6.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -33,6 +37,8 @@ BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml)
 BuildRequires: pkgconfig(shared-mime-info)
 BuildRequires: pkgconfig(soprano) 
 BuildRequires: pkgconfig(sqlite3) >= 3.6.23
+# %%check
+BuildRequires: dbus-x11 xorg-x11-server-Xvfb
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
@@ -106,11 +112,13 @@ install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akona
 
 
 %check
-## FIXME some tests fail in mock, probably needs X and/or dbus
-## tests succeed locally -- rex
-make test -C %{_target_platform} ||:
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion akonadi)" = "%{version}"
+## in mock,
+#The following tests FAILED:
+#	 14 - akonadi-dbconfigtest (Failed)
+# tests succeed locally (?) -- rex
+xvfb-run -a dbus-launch --exit-with-session make test -C %{_target_platform} ||:
 
 
 %clean
@@ -128,7 +136,6 @@ if [ $1 -eq 0 ] ; then
   update-mime-database %{_datadir}/mime &> /dev/null ||:
 fi
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS lgpl-license
@@ -163,6 +170,10 @@ fi
 
 
 %changelog
+* Sat Dec 31 2011 Rex Dieter <rdieter at fedoraproject.org> 1.6.90-2
+- %%check: try harder to make work in mock (using xvfb)
+- default to sqlite on 'small' platforms (arm)
+
 * Fri Dec 23 2011 Rex Dieter <rdieter at fedoraproject.org> 1.6.90-1
 - 1.6.90