diff --git a/qemu.changes b/qemu.changes index 5e4b7a9..cc5b68e 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Oct 14 13:05:43 UTC 2020 - Bruce Rogers + +- Note: As part of the "Close the Leap Gap" effort, it's been + decided that our SDL2 support in qemu is not worth trying + to maintain. Long ago SLE qemu stopped including SDL2 support and + now we will do the same for the openSUSE releases going forward. + Accordingly SDL2 options are now configured out, and the two sub- + packages which are SDL2 specific, namely qemu-audio-sdl and + qemu-ui-sdl, are no longer generated, and due to the rpm package + conflicts used for those packages, they will be uninstalled from + systems as qemu updates move forward +- Drop e2fsprogs-devel and libpcap-devel as BuildRequires packages. + They have not actually been needed to build qemu for a very long + time +- Add more forsplits files + ------------------------------------------------------------------- Wed Oct 7 13:34:49 UTC 2020 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index b1a1c73..008292f 100644 --- a/qemu.spec +++ b/qemu.spec @@ -208,7 +208,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # ======================================================================== %if "%{name}" == "qemu-linux-user" -BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel-static @@ -261,7 +260,6 @@ BuildRequires: cyrus-sasl-devel %if %{build_x86_firmware_from_source} BuildRequires: dos2unix %endif -BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ @@ -291,7 +289,6 @@ BuildRequires: libnfs-devel >= 1.9.3 %ifnarch %arm s390x BuildRequires: libnuma-devel %endif -BuildRequires: libpcap-devel BuildRequires: libpixman-1-0-devel >= 0.21.8 %ifarch x86_64 BuildRequires: libpmem-devel @@ -348,7 +345,6 @@ BuildRequires: bc BuildRequires: qemu-arm = %{qemuver} BuildRequires: qemu-audio-alsa = %{qemuver} BuildRequires: qemu-audio-pa = %{qemuver} -BuildRequires: qemu-audio-sdl = %{qemuver} BuildRequires: qemu-block-curl = %{qemuver} BuildRequires: qemu-block-dmg = %{qemuver} BuildRequires: qemu-block-gluster = %{qemuver} @@ -378,7 +374,6 @@ BuildRequires: qemu-skiboot = %{qemuver} BuildRequires: qemu-tools = %{qemuver} BuildRequires: qemu-ui-curses = %{qemuver} BuildRequires: qemu-ui-gtk = %{qemuver} -BuildRequires: qemu-ui-sdl = %{qemuver} BuildRequires: qemu-ui-spice-app = %{qemuver} BuildRequires: qemu-vgabios = %{sbver} BuildRequires: qemu-x86 = %{qemuver} @@ -400,7 +395,6 @@ Recommends: qemu-hw-usb-smartcard Recommends: qemu-tools Recommends: qemu-ui-curses Recommends: qemu-ui-gtk -Recommends: qemu-ui-sdl Recommends: qemu-ui-spice-app Recommends: qemu-x86 %ifarch ppc ppc64 ppc64le @@ -594,16 +588,6 @@ Release: 0 %description audio-pa This package contains a module for Pulse Audio based audio support for QEMU. -%package audio-sdl -Summary: SDL based audio support for QEMU -Group: System/Emulators/PC -Version: %{qemuver} -Release: 0 -%{qemu_module_conflicts} - -%description audio-sdl -This package contains a module for SDL based audio support for QEMU. - %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC @@ -748,16 +732,6 @@ Release: 0 %description ui-gtk This package contains a module for doing GTK based UI for QEMU. -%package ui-sdl -Summary: SDL based UI support for QEMU -Group: System/Emulators/PC -Version: %{qemuver} -Release: 0 -%{qemu_module_conflicts} - -%description ui-sdl -This package contains a module for doing SDL based UI for QEMU. - %package ui-spice-app Summary: Spice UI support for QEMU Group: System/Emulators/PC @@ -1148,7 +1122,7 @@ cd %mybuilddir %endif --enable-pie \ --enable-docs \ - --audio-drv-list="pa alsa sdl" \ + --audio-drv-list="pa alsa" \ --enable-attr \ --disable-auth-pam \ --enable-bochs \ @@ -1223,8 +1197,8 @@ cd %mybuilddir --enable-replication \ --disable-safe-stack \ --disable-sanitizers \ - --enable-sdl \ - --enable-sdl-image \ + --disable-sdl \ + --disable-sdl-image \ --enable-seccomp \ --enable-sheepdog \ --enable-smartcard \ @@ -1638,7 +1612,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -s -f %{_sysconfdir}/alternatives/skiboot.lid %{buildroot}%{_datadir}/%name/skiboot.lid install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt -for X in 00 01 02 03 04 05 06 07 08 09 +for X in 00 01 02 03 04 05 06 07 08 09 10 11 12 do ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X done @@ -1754,6 +1728,9 @@ fi %_datadir/%name/forsplits/07 %_datadir/%name/forsplits/08 %_datadir/%name/forsplits/09 +%_datadir/%name/forsplits/10 +%_datadir/%name/forsplits/11 +%_datadir/%name/forsplits/12 %_datadir/%name/keymaps %_datadir/%name/qemu-ifup %_datadir/%name/qemu-nsis.bmp @@ -2008,11 +1985,6 @@ fi %dir %_libdir/%name %_libdir/%name/audio-pa.so -%files audio-sdl -%defattr(-, root, root) -%dir %_libdir/%name -%_libdir/%name/audio-sdl.so - %files block-curl %defattr(-, root, root) %dir %_libdir/%name @@ -2095,11 +2067,6 @@ fi %dir %_libdir/%name %_libdir/%name/ui-gtk.so -%files ui-sdl -%defattr(-, root, root) -%dir %_libdir/%name -%_libdir/%name/ui-sdl.so - %files ui-spice-app %defattr(-, root, root) %dir %_libdir/%name diff --git a/qemu.spec.in b/qemu.spec.in index 2b091eb..7f650b0 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -136,7 +136,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # ======================================================================== %if "%{name}" == "qemu-linux-user" -BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel-static @@ -189,7 +188,6 @@ BuildRequires: cyrus-sasl-devel %if %{build_x86_firmware_from_source} BuildRequires: dos2unix %endif -BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ @@ -219,7 +217,6 @@ BuildRequires: libnfs-devel >= 1.9.3 %ifnarch %arm s390x BuildRequires: libnuma-devel %endif -BuildRequires: libpcap-devel BuildRequires: libpixman-1-0-devel >= 0.21.8 %ifarch x86_64 BuildRequires: libpmem-devel @@ -276,7 +273,6 @@ BuildRequires: bc BuildRequires: qemu-arm = %{qemuver} BuildRequires: qemu-audio-alsa = %{qemuver} BuildRequires: qemu-audio-pa = %{qemuver} -BuildRequires: qemu-audio-sdl = %{qemuver} BuildRequires: qemu-block-curl = %{qemuver} BuildRequires: qemu-block-dmg = %{qemuver} BuildRequires: qemu-block-gluster = %{qemuver} @@ -306,7 +302,6 @@ BuildRequires: qemu-skiboot = %{qemuver} BuildRequires: qemu-tools = %{qemuver} BuildRequires: qemu-ui-curses = %{qemuver} BuildRequires: qemu-ui-gtk = %{qemuver} -BuildRequires: qemu-ui-sdl = %{qemuver} BuildRequires: qemu-ui-spice-app = %{qemuver} BuildRequires: qemu-vgabios = %{sbver} BuildRequires: qemu-x86 = %{qemuver} @@ -328,7 +323,6 @@ Recommends: qemu-hw-usb-smartcard Recommends: qemu-tools Recommends: qemu-ui-curses Recommends: qemu-ui-gtk -Recommends: qemu-ui-sdl Recommends: qemu-ui-spice-app Recommends: qemu-x86 %ifarch ppc ppc64 ppc64le @@ -522,16 +516,6 @@ Release: 0 %description audio-pa This package contains a module for Pulse Audio based audio support for QEMU. -%package audio-sdl -Summary: SDL based audio support for QEMU -Group: System/Emulators/PC -Version: %{qemuver} -Release: 0 -%{qemu_module_conflicts} - -%description audio-sdl -This package contains a module for SDL based audio support for QEMU. - %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC @@ -676,16 +660,6 @@ Release: 0 %description ui-gtk This package contains a module for doing GTK based UI for QEMU. -%package ui-sdl -Summary: SDL based UI support for QEMU -Group: System/Emulators/PC -Version: %{qemuver} -Release: 0 -%{qemu_module_conflicts} - -%description ui-sdl -This package contains a module for doing SDL based UI for QEMU. - %package ui-spice-app Summary: Spice UI support for QEMU Group: System/Emulators/PC @@ -1005,7 +979,7 @@ cd %mybuilddir %endif --enable-pie \ --enable-docs \ - --audio-drv-list="pa alsa sdl" \ + --audio-drv-list="pa alsa" \ --enable-attr \ --disable-auth-pam \ --enable-bochs \ @@ -1080,8 +1054,8 @@ cd %mybuilddir --enable-replication \ --disable-safe-stack \ --disable-sanitizers \ - --enable-sdl \ - --enable-sdl-image \ + --disable-sdl \ + --disable-sdl-image \ --enable-seccomp \ --enable-sheepdog \ --enable-smartcard \ @@ -1495,7 +1469,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -s -f %{_sysconfdir}/alternatives/skiboot.lid %{buildroot}%{_datadir}/%name/skiboot.lid install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt -for X in 00 01 02 03 04 05 06 07 08 09 +for X in 00 01 02 03 04 05 06 07 08 09 10 11 12 do ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X done @@ -1611,6 +1585,9 @@ fi %_datadir/%name/forsplits/07 %_datadir/%name/forsplits/08 %_datadir/%name/forsplits/09 +%_datadir/%name/forsplits/10 +%_datadir/%name/forsplits/11 +%_datadir/%name/forsplits/12 %_datadir/%name/keymaps %_datadir/%name/qemu-ifup %_datadir/%name/qemu-nsis.bmp @@ -1865,11 +1842,6 @@ fi %dir %_libdir/%name %_libdir/%name/audio-pa.so -%files audio-sdl -%defattr(-, root, root) -%dir %_libdir/%name -%_libdir/%name/audio-sdl.so - %files block-curl %defattr(-, root, root) %dir %_libdir/%name @@ -1952,11 +1924,6 @@ fi %dir %_libdir/%name %_libdir/%name/ui-gtk.so -%files ui-sdl -%defattr(-, root, root) -%dir %_libdir/%name -%_libdir/%name/ui-sdl.so - %files ui-spice-app %defattr(-, root, root) %dir %_libdir/%name