From 147b42535d0129f10d65f6d507548006def75a01 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 26 Jan 2021 14:13:58 +0100
Subject: [PATCH] Simplify xvfb-run invocation

Instead of sed'ing %meson_test to remove newlines, just use 'eval' to
concatenate all of %meson_test commands together.
---
 gjs.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gjs.spec b/gjs.spec
index f2939a7..a225e85 100644
--- a/gjs.spec
+++ b/gjs.spec
@@ -5,7 +5,7 @@
 
 Name:          gjs
 Version:       1.67.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Javascript Bindings for GNOME
 
 # The following files contain code from Mozilla which
@@ -73,9 +73,7 @@ the functionality of the installed gjs package.
 %meson_install
 
 %check
-# we need to do this as meson_test macro begins with newline character
-TEST_CMD="%meson_test"
-xvfb-run -s "-screen 0 1600x1200x24" `echo $TEST_CMD | grep -v -e "^$"`
+xvfb-run -s "-screen 0 1600x1200x24" eval "%meson_test"
 
 %files
 %license COPYING
@@ -100,6 +98,9 @@ xvfb-run -s "-screen 0 1600x1200x24" `echo $TEST_CMD | grep -v -e "^$"`
 %{_datadir}/installed-tests/
 
 %changelog
+* Tue Jan 26 2021 Kalev Lember <klember@redhat.com> - 1.67.1-3
+- Simplify xvfb-run invocation
+
 * Tue Jan 26 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.1-2
 - Enable tests during rpmbuild