diff --git a/libinput.spec b/libinput.spec
index 551e1eb..7534ac1 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -16,7 +16,7 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%{nil}
+%global flavor @BUILD_FLAVOR@%nil
 
 %if "%flavor" == ""
 Name:           libinput
@@ -115,7 +115,7 @@ configuration options and configuration defaults.
 %package -n %pname-debug-gui
 Summary:        Graphical libinput debug tool
 Group:          Hardware/Other
-Requires:       libinput-tools == %{version}-%{release}
+Requires:       libinput-tools = %version-%release
 
 %description -n %pname-debug-gui
 This tool allows graphical libinput debugging. It visualizes
@@ -140,7 +140,7 @@ to develop applications that require libinput.
 %meson \
 	--includedir="%_includedir/%pname" \
 	--datadir="%_datadir/%pname-%version" \
-	-Dzshcompletiondir=%{?with_completion:"%_datadir/zsh/site-functions"}%{!?with_completion:"no"} \
+	-Dzshcompletiondir="%{?with_completion:%_datadir/zsh/site-functions}%{!?with_completion:no}" \
 	-Dudev-dir="%_prefix/lib/udev" \
 	-Dtests=false \
 	-Ddebug-gui=%{?with_debug_gui:true}%{!?with_debug_gui:false} \