up to 2.11.1 (security fixes)

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index d93c0ecce3e9367e98b401fdc973fd818cf345e2..1cb0ab51f7a409f009bd81b0b336853f029426e5 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_without sdl             # SDL UI and audio support
 %bcond_without gl              # Don't require gl deps
-%bcond_with    ceph            # Ceph/RBD 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
@@ -37,12 +37,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       2.9.0
+Version:       2.11.1
 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
-Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 02781eb15b364aedef79da7a5113f5b7
+Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz
+# Source0-md5: 0ee48c0f0cae47cc5d05408e03cd199e
 Source2:       %{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
@@ -64,6 +64,7 @@ Patch3:               %{name}-user-execve.patch
 Patch4:                %{name}-xattr.patch
 Patch5:                libjpeg-boolean.patch
 Patch6:                x32.patch
+Patch7:                %{name}-glibc2_27.patch
 URL:           http://www.qemu-project.org/
 %{?with_gl:BuildRequires:      OpenGL-GLX-devel}
 %{?with_gl:BuildRequires:      OpenGL-devel}
@@ -85,7 +86,7 @@ BuildRequires:        libaio-devel
 BuildRequires: libcap-devel
 BuildRequires: libcap-ng-devel
 %{?with_gl:BuildRequires:      libepoxy-devel}
-BuildRequires: libfdt-devel
+BuildRequires: libfdt-devel >= 1.4.2
 %{?with_rdma:BuildRequires:    libibverbs-devel}
 %{?with_iscsi:BuildRequires:   libiscsi-devel >= 1.9.0}
 BuildRequires: libjpeg-devel
@@ -149,6 +150,7 @@ Requires:   %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
 Requires:      %{name}-system-moxie = %{version}-%{release}
+Requires:      %{name}-system-nios2 = %{version}-%{release}
 Requires:      %{name}-system-or1k = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}
 Requires:      %{name}-system-s390x = %{version}-%{release}
@@ -166,6 +168,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %if %{with sdl} \
 Requires:      SDL2 \
 %endif \
+Requires:      libfdt >= 1.4.2 \
 %if %{with seccomp} \
 Requires:      libseccomp >= 2.1.0 \
 %endif \
@@ -479,6 +482,25 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem Moxie.
 
+%package system-nios2
+Summary:       QEMU system emulator for Nios II
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Nios II
+Group:         Development/Tools
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%description system-nios2
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the system emulator with Nios II CPU.
+
+%description system-nios2 -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet zawiera emulator systemu z procesorem Nios II.
+
 %package system-or1k
 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC
@@ -486,6 +508,7 @@ Group:              Development/Tools
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-or1k
+Obsoletes:     qemu-system-or32
 
 %description system-or1k
 QEMU is a generic and open source processor emulator which achieves a
@@ -756,6 +779,7 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # workaround for conflict with alsa/error.h
 ln -s ../error.h qapi/error.h
@@ -812,7 +836,6 @@ build dynamic \
        %{__enable_disable smartcard smartcard} \
        --enable-tpm \
        %{__enable_disable usbredir usb-redir} \
-       --enable-uuid \
        --enable-vde \
        --enable-virtfs \
        --enable-vnc-jpeg \
@@ -850,7 +873,6 @@ build static \
        --disable-spice \
        --disable-tcmalloc \
        --disable-tools \
-       --disable-uuid \
        --enable-user \
        --disable-system \
        --static
@@ -1056,13 +1078,16 @@ fi
 %attr(755,root,root) %{_bindir}/ivshmem-client
 %attr(755,root,root) %{_bindir}/ivshmem-server
 %attr(755,root,root) %{_bindir}/virtfs-proxy-helper
+%attr(755,root,root) %{_bindir}/qemu-keymap
 %attr(755,root,root) %{_bindir}/qemu-nbd
+%attr(755,root,root) %{_bindir}/qemu-pr-helper
 %attr(755,root,root) %{_bindir}/qemu-tilegx
-%attr(755,root,root) %{_libdir}/qemu-bridge-helper
+%attr(755,root,root) %{_libexecdir}/qemu-bridge-helper
 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*
+%{_mandir}/man7/qemu-block-drivers.7*
 %{_mandir}/man8/qemu-nbd.8*
 
 %dir %{_datadir}/qemu
@@ -1131,6 +1156,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
 %attr(755,root,root) %{_bindir}/qemu-cris
+%attr(755,root,root) %{_bindir}/qemu-hppa
 %attr(755,root,root) %{_bindir}/qemu-i386
 %attr(755,root,root) %{_bindir}/qemu-io
 %attr(755,root,root) %{_bindir}/qemu-m68k
@@ -1142,6 +1168,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mips64el
 %attr(755,root,root) %{_bindir}/qemu-mipsn32
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el
+%attr(755,root,root) %{_bindir}/qemu-nios2
 %attr(755,root,root) %{_bindir}/qemu-or1k
 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64
@@ -1164,6 +1191,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-arm-static
 %attr(755,root,root) %{_bindir}/qemu-armeb-static
 %attr(755,root,root) %{_bindir}/qemu-cris-static
+%attr(755,root,root) %{_bindir}/qemu-hppa-static
 %attr(755,root,root) %{_bindir}/qemu-i386-static
 %attr(755,root,root) %{_bindir}/qemu-m68k-static
 %attr(755,root,root) %{_bindir}/qemu-microblaze-static
@@ -1174,6 +1202,7 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mipsel-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el-static
+%attr(755,root,root) %{_bindir}/qemu-nios2-static
 %attr(755,root,root) %{_bindir}/qemu-or1k-static
 %attr(755,root,root) %{_bindir}/qemu-ppc-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64-static
@@ -1229,6 +1258,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-moxie
 
+%files system-nios2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-nios2
+
 %files system-or1k
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-or1k
@@ -1239,11 +1272,13 @@ fi
 %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}/qemu_vga.ndrv
 %{_datadir}/%{name}/u-boot.e500
 
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x
+%{_datadir}/%{name}/s390-netboot.img
 
 %files system-sh4
 %defattr(644,root,root,755)