X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=171f56577604de7a694e19ec13d3f1c2b8a2b007;hb=5fcc263d41237281093eb90ad5971d1fd5570bc1;hp=acf466ad0537f36d4e9c732f2bd23ed67916f90b;hpb=899398c43a84faa2bac169b5a8bfbed3ed4be338;p=packages%2Fqemu.git diff --git a/qemu.spec b/qemu.spec index acf466a..171f565 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,13 +1,13 @@ +# TODO: archipelago (libxseg) on bcond (GPL v3 vs v2-only conflict) # # Conditional build: %bcond_without sdl # SDL UI and audio support -%bcond_without glx # OpenGL/GLX support %bcond_without ceph # Ceph/RBD support %bcond_without glusterfs # GlusterFS backend %bcond_without rdma # RDMA-based migration support %bcond_with gtk2 # GTK+ 2.x instead of 3.x %bcond_without gtk3 # Do not build GTK+ UI -%bcond_with vte # VTE support in GTK+ UI +%bcond_without vte # VTE support in GTK+ UI %bcond_without spice # SPICE support %bcond_with esd # EsounD audio support %bcond_without oss # OSS audio support @@ -32,13 +32,12 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 2.2.0 -Release: 3 -License: GPL v2+ +Version: 2.4.0 +Release: 1 +License: GPL v2 Group: Applications/Emulators Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2 -# Source0-md5: f7a5e2da22d057eb838a91da7aff43c8 -Source2: %{name}.binfmt +# Source0-md5: 186ee8194140a484a455f8e3c74589f4 # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -57,12 +56,13 @@ Patch5: libjpeg-boolean.patch # Proof of concept, for reference, do not remove Patch400: %{name}-kde_virtual_workspaces_hack.patch URL: http://www.qemu-project.org/ -%{?with_opengl:BuildRequires: OpenGL-GLX-devel} +BuildRequires: OpenGL-GLX-devel %{?with_sdl:BuildRequires: SDL2-devel >= 2.0} BuildRequires: alsa-lib-devel -BuildRequires: bcc +BuildRequires: bcc >= 0.16.21-2 %{?with_bluetooth:BuildRequires: bluez-libs-devel} %{?with_brlapi:BuildRequires: brlapi-devel} +BuildRequires: bzip2-devel %{?with_ceph:BuildRequires: ceph-devel} BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel >= 2 @@ -89,8 +89,10 @@ BuildRequires: libuuid-devel BuildRequires: lzo-devel >= 2 BuildRequires: ncurses-devel %{?with_smartcard:BuildRequires: nss-devel >= 3.12.8} +BuildRequires: numactl-devel BuildRequires: perl-Encode BuildRequires: perl-tools-pod +BuildRequires: pixman-devel >= 0.21.8 BuildRequires: pkgconfig %{?with_pulseaudio:BuildRequires: pulseaudio-devel} BuildRequires: rpmbuild(macros) >= 1.644 @@ -151,6 +153,7 @@ Requires: SDL2 \ Requires: libseccomp >= 2.1.0 \ %endif \ Requires: libusb >= 1.0.13 \ +Requires: pixman >= 0.21.8 \ %if %{with usbredir} \ Requires: usbredir >= 0.6 \ %endif \ @@ -163,8 +166,9 @@ Requires: gtk+3 >= 3.0.0 \ %{?with_vte:Requires: vte2.90 >= 0.32.0} \ %endif -# some PPC/SPARC boot image in ELF format -%define _noautostrip .*%{_datadir}/qemu/.*-.* +# don't strip/chrpath anything in there; these are boot images, roms etc +%define _noautostrip .*%{_datadir}/qemu/.* +%define _noautochrpath .*%{_datadir}/qemu/.* %description QEMU is a FAST! processor emulator. By using dynamic translation it @@ -657,6 +661,18 @@ Requires: %{name}-common = %{version}-%{release} %description module-block-curl -l pl.UTF-8 Moduł QEMU dla urządeń blokowych typu 'curl'. +%package module-block-dmg +Summary: QEMU module for 'dmg' block devices +Summary(pl.UTF-8): Moduł QEMU dla urządeń blokowych typu 'dmg' +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description module-block-dmg +'dmg' block device support for QEMU. + +%description module-block-dmg -l pl.UTF-8 +Moduł QEMU dla urządeń blokowych typu 'dmg'. + %package module-block-gluster Summary: QEMU module for 'gluster' block devices Summary(pl.UTF-8): Moduł QEMU dla urządeń blokowych typu 'gluster' @@ -742,7 +758,6 @@ ln -s ../error.h qapi/error.h --enable-fdt \ %{__enable_disable glusterfs} \ %{__enable_disable iscsi libiscsi} \ - %{__enable_disable glx} \ %{__enable_disable ceph rbd} \ %{__enable_disable rdma} \ %{__enable_disable sdl} \ @@ -768,7 +783,6 @@ ln -s ../error.h qapi/error.h %{__enable_disable libnfs} \ --enable-lzo \ %{__enable_disable snappy} \ - --enable-quorum \ --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \ --interp-prefix=%{_libdir}/qemu/lib-%%M \ %if %{without gtk2} && %{without gtk3} @@ -816,27 +830,6 @@ install -p ksmctl $RPM_BUILD_ROOT%{_sbindir} install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf -for i in dummy \ -%ifnarch %{ix86} %{x8664} - qemu-i386 \ -%endif -%ifnarch arm - qemu-arm \ -%endif -%ifnarch ppc ppc64 - qemu-ppc \ -%endif -%ifnarch sparc sparc64 - qemu-sparc \ -%endif -%ifnarch sh4 - qemu-sh4 \ -%endif -; do - test $i = dummy && continue - grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i.conf -done < %{SOURCE2} - # packaged as %doc %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-{doc,tech}.html %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qmp-commands.txt @@ -878,20 +871,16 @@ if [ "$1" = "0" ]; then %groupremove kvm fi -%triggerpostun common -- qemu-common < 1.6.1-4 - %files %defattr(644,root,root,755) %files common -f %{name}.lang %defattr(644,root,root,755) -%doc README qemu-doc.html qemu-tech.html qmp-commands.txt +%doc LICENSE README qemu-doc.html qemu-tech.html qmp-commands.txt %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu/target-*.conf %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ksm -%dir %{_sysconfdir}/qemu %attr(755,root,root) %{_bindir}/virtfs-proxy-helper %attr(755,root,root) %{_bindir}/qemu-nbd %attr(755,root,root) %{_libdir}/qemu-bridge-helper @@ -938,11 +927,12 @@ fi %{_datadir}/%{name}/sgabios.bin %{_datadir}/%{name}/slof.bin %{_datadir}/%{name}/spapr-rtas.bin +%{_datadir}/%{name}/vgabios.bin %{_datadir}/%{name}/vgabios-cirrus.bin %{_datadir}/%{name}/vgabios-qxl.bin %{_datadir}/%{name}/vgabios-stdvga.bin +%{_datadir}/%{name}/vgabios-virtio.bin %{_datadir}/%{name}/vgabios-vmware.bin -%{_datadir}/%{name}/vgabios.bin %dir %{_libdir}/%{name} @@ -953,7 +943,6 @@ fi %files user %defattr(644,root,root,755) -/usr/lib/binfmt.d/qemu-*.conf %attr(755,root,root) %{_bindir}/qemu-aarch64 %attr(755,root,root) %{_bindir}/qemu-alpha %attr(755,root,root) %{_bindir}/qemu-arm @@ -1032,7 +1021,6 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-ppc %attr(755,root,root) %{_bindir}/qemu-system-ppc64 -#%attr(755,root,root) %{_bindir}/qemu-system-ppc64le %attr(755,root,root) %{_bindir}/qemu-system-ppcemb %{_datadir}/%{name}/u-boot.e500 @@ -1085,6 +1073,10 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/block-curl.so +%files module-block-dmg +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/block-dmg.so + %if %{with glusterfs} %files module-block-gluster %defattr(644,root,root,755)