[dbusmenu-qt] .spec cleanup, %check harder

[Rex Dieter]

commit f1aae8cb550a149954d5765ff2e0c806f38b015a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jan 24 23:08:43 2014 -0600

    .spec cleanup, %check harder

 dbusmenu-qt.spec |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/dbusmenu-qt.spec b/dbusmenu-qt.spec
index 5e5378b..f25fe8c 100644
--- a/dbusmenu-qt.spec
+++ b/dbusmenu-qt.spec
@@ -2,13 +2,11 @@
 Summary: A Qt implementation of the DBusMenu protocol 
 Name:    dbusmenu-qt
 Version: 0.9.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
-Group: System Environment/Libraries
 License: LGPLv2+
 URL: https://launchpad.net/libdbusmenu-qt/
 Source0  https://launchpad.net/libdbusmenu-qt/trunk/%{version}/+download/libdbusmenu-qt-%{version}.tar.bz2
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ## upstream patches
 
@@ -28,10 +26,8 @@ This library provides a Qt implementation of the DBusMenu protocol.
 The DBusMenu protocol makes it possible for applications to export and import
 their menus over DBus.
 
-
 %package devel
 Summary: Development files for %{name}
-Group:   Development/Libraries
 Provides: libdbusmenu-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
@@ -52,11 +48,10 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
-rm -rf %{buildroot}%{_docdir}/dbusmenu-qt
+rm -rfv %{buildroot}%{_docdir}/dbusmenu-qt
 
 
 %check
@@ -64,23 +59,17 @@ rm -rf %{buildroot}%{_docdir}/dbusmenu-qt
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion dbusmenu-qt)" = "%{version}"
 # test suite
-xvfb-run dbus-launch make -C %{_target_platform} check ||:
-
-
-%clean
-rm -rf %{buildroot} 
+xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform} check ARGS="--output-on-failure" ||:
 
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_libdir}/libdbusmenu-qt.so.2*
 
 %files devel
-%defattr(-,root,root,-)
 %doc %{_target_platform}/html/
 %{_includedir}/dbusmenu-qt/
 %{_libdir}/libdbusmenu-qt.so
@@ -88,6 +77,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 24 2014 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-6
+- .spec cleanup, %%check harder
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild