From 984010977a8ab923b84da16d362f101e0fd8ff4f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Jan 10 2020 16:16:38 +0000
Subject: Modify macros


---

diff --git a/xpra.spec b/xpra.spec
index 2603b34..3c74771 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -5,7 +5,7 @@
 # For debugging only
 %bcond_with debug
 %if !%{without debug}
-%define _with_debug --with-debug
+%global _with_debug --with-debug
 %endif
 #
 
@@ -13,15 +13,15 @@
 # --with flag isn't specifed, and we need to have the --without
 # specified option in that case.
 %if !%{with enc_x264}
-%define _with_enc_x264 --without-enc_x264
+%global with_enc_x264 --without-enc_x264
 %endif
 
 %if !%{with dec_avcodec2}
-%define _with_dec_avcodec2 --without-dec_avcodec2
+%global with_dec_avcodec2 --without-dec_avcodec2
 %endif
 
 %if !%{with csc_swscale}
-%define _with_csc_swscale --without-csc_swscale
+%global with_csc_swscale --without-csc_swscale
 %endif
 
 # Remove private provides from .so files in the python3_sitearch directory
@@ -159,20 +159,21 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py
 
 %build
 %py3_build -- --with-verbose --with-vpx \
- %{?_with_enc_x264} \
- %{?_with_dec_avcodec2} \
- %{?_with_csc_swscale} \
- %{?_with_debug} \
+ %{with_enc_x264} \
+ %{with_dec_avcodec2} \
+ %{with_csc_swscale} \
+ %{with_debug} \
  --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict
 
 %install
 %py3_install -- --with-verbose --with-vpx \
- %{?_with_enc_x264} \
- %{?_with_dec_avcodec2} \
- %{?_with_csc_swscale} \
- %{?_with_debug} \
+ %{with_enc_x264} \
+ %{with_dec_avcodec2} \
+ %{with_csc_swscale} \
+ %{with_debug} \
  --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict
 
+
 # Installation of these service files is not permitted on Fedora
 # See https://pagure.io/fesco/issue/1759
 rm -f %{buildroot}/lib/systemd/system/xpra.service