From cc80c4d579b776307f37446c33b4c703b4c4f281 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 29 2016 21:31:02 +0000 Subject: fix FTBFS fix tests, update %%files --- diff --git a/konsole5.spec b/konsole5.spec index a01043b..d9285a0 100644 --- a/konsole5.spec +++ b/konsole5.spec @@ -116,10 +116,11 @@ install -m644 -p -b -D %{SOURCE10} %{buildroot}%{_sysconfdir}/xdg/konsolerc %check appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.konsole.appdata.xml ||: desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.konsole.desktop -test "$(%{_target_platform}/src/konsole --version | grep ^Konsole | cut -d' ' -f2)" = "%{version}" %if 0%{?tests} +test "$(xvfb-run -a %{_target_platform}/src/konsole --version)" = "konsole %{version}" ||: export CTEST_OUTPUT_ON_FAILURE=1 -xvfb-run -a dbus-launch --exit-with-session \ +DBUS_SESSION_BUS_ADDRESS= +xvfb-run -a \ time make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %endif @@ -135,8 +136,6 @@ time make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" | %{_kf5_datadir}/kservices5/ServiceMenus/konsolehere.desktop %{_kf5_datadir}/kservices5/ServiceMenus/konsolerun.desktop %{_kf5_datadir}/kservicetypes5/terminalemulator.desktop -%{_kf5_datadir}/kxmlgui5/konsole/konsoleui.rc -%{_kf5_datadir}/kxmlgui5/konsole/sessionui.rc %lang(en) %{_kf5_docdir}/HTML/en/konsole/ %post part -p /sbin/ldconfig @@ -149,7 +148,6 @@ time make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" | %{_kf5_libdir}/libkonsoleprivate.so.%{maj_ver}* %{_kf5_qtplugindir}/konsolepart.so %{_kf5_datadir}/kservices5/konsolepart.desktop -%{_kf5_datadir}/kxmlgui5/konsole/partui.rc %changelog