SHA256
1
0
forked from pool/qemu

Accepting request 828206 from home:bfrogers:branches:Virtualization

Fix compilation errors seen with pre-release gcc 11
Add a "Split-Provides" mechanism for the subpackages split off in v5.1.0

OBS-URL: https://build.opensuse.org/request/show/828206
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=561
This commit is contained in:
Bruce Rogers
2020-08-20 14:03:10 +00:00
committed by Git OBS Bridge
parent 607fbaf071
commit 7f9c57ac07
11 changed files with 280 additions and 112 deletions

View File

@@ -122,6 +122,10 @@ Source13: supported.s390.txt
Source14: 50-seabios-256k.json
Source15: 60-seabios-128k.json
Source200: qemu-rpmlintrc
Source201: qemu-ga-ref.html
Source202: qemu-ga-ref.txt
Source203: qemu-qmp-ref.html
Source204: qemu-qmp-ref.txt
Source300: bundles.tar.xz
Source301: update_git.sh
Source302: config.sh
@@ -656,6 +660,7 @@ Summary: Baum braille chardev support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_docdir/%name/qemu-ga-ref.html
%{qemu_module_conflicts}
%description chardev-baum
@@ -666,6 +671,7 @@ Summary: QXL display support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_docdir/%name/qemu-ga-ref.txt
%{qemu_module_conflicts}
%description hw-display-qxl
@@ -676,17 +682,21 @@ Summary: USB redirection support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_docdir/%name/qemu-qmp-ref.html
%{qemu_module_conflicts}
%description hw-usb-redirect
This package contains a module for USB redirection support.
%if 0%{?is_opensuse}
%package hw-usb-smartcard
Summary: USB smartcard support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_docdir/%name/qemu-qmp-ref.txt
%{qemu_module_conflicts}
%endif
%description hw-usb-smartcard
This package contains a modules for USB smartcard support.
@@ -1537,6 +1547,10 @@ install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%ifarch s390x
install -D -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/modules-load.d/kvm.conf
%endif
install -D -m 0644 %{SOURCE201} %{buildroot}%_docdir/%name/qemu-ga-ref.html
install -D -m 0644 %{SOURCE202} %{buildroot}%_docdir/%name/qemu-ga-ref.txt
install -D -m 0644 %{SOURCE203} %{buildroot}%_docdir/%name/qemu-qmp-ref.html
install -D -m 0644 %{SOURCE204} %{buildroot}%_docdir/%name/qemu-qmp-ref.txt
%fdupes -s %{buildroot}
# ========================================================================
@@ -1951,24 +1965,32 @@ fi
%files chardev-baum
%defattr(-, root, root)
%dir %_docdir/%name
%dir %_libdir/%name
%_libdir/%name/chardev-baum.so
%_docdir/%name/qemu-ga-ref.html
%files hw-display-qxl
%defattr(-, root, root)
%dir %_docdir/%name
%dir %_libdir/%name
%_libdir/%name/hw-display-qxl.so
%_docdir/%name/qemu-ga-ref.txt
%files hw-usb-redirect
%defattr(-, root, root)
%dir %_docdir/%name
%dir %_libdir/%name
%_libdir/%name/hw-usb-redirect.so
%_docdir/%name/qemu-qmp-ref.html
%if 0%{?is_opensuse}
%files hw-usb-smartcard
%defattr(-, root, root)
%dir %_docdir/%name
%dir %_libdir/%name
%_libdir/%name/hw-usb-smartcard.so
%_docdir/%name/qemu-qmp-ref.txt
%endif
%files ui-curses