943966 Disable dbus UI + audio on centos stream 8

Authored and Committed by crobinso 2 years ago
1 file changed. 22 lines added. 2 lines removed.
    Disable dbus UI + audio on centos stream 8
    
    Signed-off-by: Cole Robinson <crobinso@redhat.com>
    
        
file modified
+22 -2
qemu.spec CHANGED
@@ -108,6 +108,12 @@
108
108
%global have_jack 0
109
109
%endif
110
110
111
+ %global have_dbus_display 1
112
+ %if %{defined rhel} && 0%{?rhel} < 9
113
+ # RHEL/Centos 8 glib is not new enough
114
+ %global have_dbus_display 0
115
+ %endif
116
+
111
117
%global have_sdl_image %{defined fedora}
112
118
%global have_fdt 1
113
119
%global have_opengl 1
@@ -195,7 +201,6 @@
195
201
%endif
196
202
%define requires_block_ssh Requires: %{name}-block-ssh = %{evr}
197
203
%define requires_audio_alsa Requires: %{name}-audio-alsa = %{evr}
198
- %define requires_audio_dbus Requires: %{name}-audio-dbus = %{evr}
199
204
%define requires_audio_oss Requires: %{name}-audio-oss = %{evr}
200
205
%define requires_audio_pa Requires: %{name}-audio-pa = %{evr}
201
206
%define requires_audio_sdl Requires: %{name}-audio-sdl = %{evr}
@@ -203,7 +208,6 @@
203
208
%define requires_device_usb_host Requires: %{name}-device-usb-host = %{evr}
204
209
%define requires_device_usb_redirect Requires: %{name}-device-usb-redirect = %{evr}
205
210
%define requires_ui_curses Requires: %{name}-ui-curses = %{evr}
206
- %define requires_ui_dbus Requires: %{name}-ui-dbus = %{evr}
207
211
%define requires_ui_gtk Requires: %{name}-ui-gtk = %{evr}
208
212
%define requires_ui_sdl Requires: %{name}-ui-sdl = %{evr}
209
213
%define requires_ui_egl_headless Requires: %{name}-ui-egl-headless = %{evr}
@@ -231,6 +235,14 @@
231
235
%define requires_audio_jack %{nil}
232
236
%endif
233
237
238
+ %if %{have_dbus_display}
239
+ %define requires_audio_dbus Requires: %{name}-audio-dbus = %{evr}
240
+ %define requires_ui_dbus Requires: %{name}-ui-dbus = %{evr}
241
+ %else
242
+ %define requires_audio_dbus %{nil}
243
+ %define requires_ui_dbus %{nil}
244
+ %endif
245
+
234
246
%if %{have_spice}
235
247
%define requires_ui_spice_app Requires: %{name}-ui-spice-app = %{evr}
236
248
%define requires_ui_spice_core Requires: %{name}-ui-spice-core = %{evr}
@@ -696,11 +708,13 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
696
708
%description audio-alsa
697
709
This package provides the additional ALSA audio driver for QEMU.
698
710
711
+ %if %{have_dbus_display}
699
712
%package audio-dbus
700
713
Summary: QEMU D-Bus audio driver
701
714
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
702
715
%description audio-dbus
703
716
This package provides the additional D-Bus audio driver for QEMU.
717
+ %endif
704
718
705
719
%package audio-oss
706
720
Summary: QEMU OSS audio driver
@@ -735,11 +749,13 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
735
749
%description ui-curses
736
750
This package provides the additional curses UI for QEMU.
737
751
752
+ %if %{have_dbus_display}
738
753
%package ui-dbus
739
754
Summary: QEMU D-Bus UI driver
740
755
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
741
756
%description ui-dbus
742
757
This package provides the additional D-Bus UI for QEMU.
758
+ %endif
743
759
744
760
%package ui-gtk
745
761
Summary: QEMU GTK UI driver
@@ -1989,8 +2005,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
1989
2005
1990
2006
%files audio-alsa
1991
2007
%{_libdir}/%{name}/audio-alsa.so
2008
+ %if %{have_dbus_display}
1992
2009
%files audio-dbus
1993
2010
%{_libdir}/%{name}/audio-dbus.so
2011
+ %endif
1994
2012
%files audio-oss
1995
2013
%{_libdir}/%{name}/audio-oss.so
1996
2014
%files audio-pa
@@ -2005,8 +2023,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
2005
2023
2006
2024
%files ui-curses
2007
2025
%{_libdir}/%{name}/ui-curses.so
2026
+ %if %{have_dbus_display}
2008
2027
%files ui-dbus
2009
2028
%{_libdir}/%{name}/ui-dbus.so
2029
+ %endif
2010
2030
%files ui-gtk
2011
2031
%{_libdir}/%{name}/ui-gtk.so
2012
2032
%files ui-sdl