[dbusmenu-qt] fix %check
Rex Dieter
rdieter at fedoraproject.org
Tue Dec 27 23:26:11 UTC 2011
commit cace6b36bd68289a5e76157eb97a8047aa4f62dd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Dec 27 17:26:08 2011 -0600
fix %check
dbusmenu-qt.spec | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/dbusmenu-qt.spec b/dbusmenu-qt.spec
index 020ac22..d0fe7f6 100644
--- a/dbusmenu-qt.spec
+++ b/dbusmenu-qt.spec
@@ -1,8 +1,8 @@
Summary: A Qt implementation of the DBusMenu protocol
-Name: dbusmenu-qt
+Name: dbusmenu-qt
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
@@ -17,6 +17,8 @@ BuildRequires: doxygen
BuildRequires: pkgconfig
BuildRequires: pkgconfig(QJson)
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtGui)
+# test-suite
+BuildRequires: xorg-x11-server-Xvfb dbus-x11
Provides: libdbusmenu-qt = %{version}-%{release}
@@ -29,7 +31,7 @@ their menus over DBus.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
+Group: Development/Libraries
Provides: libdbusmenu-devel = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -61,8 +63,8 @@ rm -rf %{buildroot}%{_docdir}/dbusmenu-qt
# verify pkg-config version
export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
test "$(pkg-config --modversion dbusmenu-qt)" = "%{version}"
-# unfortunately, most of these require an active X/dbus session
-make -C %{_target_platform}/tests check ||:
+# test suite
+xvfb-run dbus-launch make -C %{_target_platform} check
%clean
@@ -70,10 +72,8 @@ rm -rf %{buildroot}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
-
%files
%defattr(-,root,root,-)
%doc COPYING README
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Dec 27 2011 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-2
+- fix %%check
+
* Sat Oct 01 2011 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-1
- 0.9.0
- pkgconfig-style deps
More information about the scm-commits
mailing list