X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=cfa48fd27e38b01af225a22d5779ae088ee4b141;hb=94b4568bec1c5649d50b0a6d201d9debfd219d26;hp=c8f8f61453b7e0b48a606d59fac1239ead4344aa;hpb=a4cb6775b1dba64ef966673e32902183188143db;p=packages%2Fqemu.git diff --git a/qemu.spec b/qemu.spec index c8f8f61..cfa48fd 100644 --- a/qemu.spec +++ b/qemu.spec @@ -32,13 +32,12 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 2.3.0 -Release: 2 +Version: 2.5.0 +Release: 1 License: GPL v2 Group: Applications/Emulators Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2 -# Source0-md5: 2fab3ea4460de9b57192e5b8b311f221 -Source2: %{name}.binfmt +# Source0-md5: f469f2330bbe76e3e39db10e9ac4f8db # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -48,14 +47,11 @@ Source6: ksm.sysconfig Source7: ksmctl.c Source9: ksmtuned Source10: ksmtuned.conf -Source12: 99-%{name}-guest-agent.rules Patch0: %{name}-cflags.patch Patch1: vgabios-widescreens.patch Patch2: %{name}-whitelist.patch -Patch3: %{name}-system-libcacard.patch -Patch4: %{name}-xattr.patch -Patch5: libjpeg-boolean.patch -Patch6: CVE-2015-3456.patch +Patch3: %{name}-xattr.patch +Patch4: libjpeg-boolean.patch # Proof of concept, for reference, do not remove Patch400: %{name}-kde_virtual_workspaces_hack.patch URL: http://www.qemu-project.org/ @@ -250,6 +246,19 @@ images. Ten pakiet udostępnia działające z linii poleceń narzędzia do operacji na obrazach dysków. +%package ivshmem +Summary: Client and server for QEMU ivshmem device +Summary(pl.UTF-8): Klient i serwer dla urządzeia ivshmem QEMU +Group: Development/Tools + +%description ivshmem +This package provides client and server tools for QEMU's ivshmem +device. + +%description ivshmem -l pl.UTF-8 +Ten pakiet udostępnia działające z linii poleceń narzędzia dla +urządzenia ivshmem QEMU. + %package user Summary: QEMU user mode emulation of qemu targets Summary(pl.UTF-8): QEMU - emulacja trybu użytkownika środowisk qemu @@ -664,6 +673,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' @@ -721,10 +742,6 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'. %patch2 -p0 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 - -%{__mv} libcacard libcacard-use-system-lib # workaround for conflict with alsa/error.h ln -s ../error.h qapi/error.h @@ -756,7 +773,7 @@ ln -s ../error.h qapi/error.h --with-sdlabi=2.0 \ %{__enable_disable seccomp} \ %{__enable_disable spice} \ - %{__enable_disable smartcard smartcard-nss} \ + %{__enable_disable smartcard smartcard} \ --enable-tpm \ --enable-trace-backends="nop%{?with_systemtap:,dtrace}%{?with_lttng:,ust}" \ %{__enable_disable usbredir usb-redir} \ @@ -766,7 +783,6 @@ ln -s ../error.h qapi/error.h --enable-vnc-jpeg \ --enable-vnc-png \ --enable-vnc-sasl \ - --enable-vnc-tls \ %{!?with_vte:--disable-vte} \ --enable-kvm \ %{__enable_disable xen} \ @@ -775,7 +791,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} @@ -823,30 +838,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 the qemu-guest-agent subpackage install udev rules. -install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d - -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 @@ -895,11 +886,9 @@ fi %defattr(644,root,root,755) %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 @@ -946,11 +935,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} @@ -959,9 +949,13 @@ fi %attr(755,root,root) %{_bindir}/qemu-img %{_mandir}/man1/qemu-img.1* +%files ivshmem +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/ivshmem-client +%attr(755,root,root) %{_bindir}/ivshmem-server + %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 @@ -989,6 +983,7 @@ fi %attr(755,root,root) %{_bindir}/qemu-sparc %attr(755,root,root) %{_bindir}/qemu-sparc32plus %attr(755,root,root) %{_bindir}/qemu-sparc64 +%attr(755,root,root) %{_bindir}/qemu-tilegx %attr(755,root,root) %{_bindir}/qemu-unicore32 %attr(755,root,root) %{_bindir}/qemu-x86_64 @@ -1040,7 +1035,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 @@ -1087,13 +1081,17 @@ fi %files guest-agent %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/99-qemu-guest-agent.rules %attr(755,root,root) %{_bindir}/qemu-ga +%{_mandir}/man8/qemu-ga.8* %files module-block-curl %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)