- up to 2.8.0

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index 87bcc5d95718fa6e4efa215d462a9acd9ec20781..f99a7072f91ca00bf94754165f3fc0664d479093 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -38,12 +38,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       2.7.0
-Release:       2
+Version:       2.8.0
+Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 08d4d06d1cb598efecd796137f4844ab
+# Source0-md5: 17940dce063b6ce450a12e719a6c9c43
 Source2:       %{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
@@ -292,7 +292,6 @@ Ten pakiet udostępnia emulację trybu użytkownika środowisk QEMU.
 %package user-static
 Summary:       QEMU user mode emulation of qemu targets static build
 Group:         Development/Tools
-Requires:      %{name}-common = %{version}-%{release}
 Requires(post,postun): systemd-units >= 38
 Requires:      systemd-units >= 38
 
@@ -972,11 +971,16 @@ for i in dummy \
        qemu-sh4eb \
 ; do
        test $i = dummy && continue
-       grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i.conf
+       grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i-dynamic.conf
+
+       %if %{with user_static}
+       grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i-static.conf
+       %{__sed} -i -e "s/$i/$i-static/" $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i-static.conf
+       %endif
 done < %{SOURCE2}
 
 # packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-{doc,tech}.html
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qmp-commands.txt
 
 # install patched vesa tables with additional widescreen modes.
@@ -1035,6 +1039,12 @@ fi
 %postun user
 %systemd_service_restart systemd-binfmt.service
 
+%post user-static
+%systemd_service_restart systemd-binfmt.service
+
+%postun user-static
+%systemd_service_restart systemd-binfmt.service
+
 %post guest-agent
 %systemd_reload
 
@@ -1050,7 +1060,7 @@ fi
 %files common -f %{name}.lang
 %defattr(644,root,root,755)
 %doc LICENSE README
-%doc build-dynamic/{qemu-doc.html,qemu-tech.html,qmp-commands.txt}
+%doc build-dynamic/qemu-doc.html
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf
@@ -1108,6 +1118,7 @@ fi
 %{_datadir}/%{name}/QEMU,tcx.bin
 %{_datadir}/%{name}/s390-ccw.img
 %{_datadir}/%{name}/sgabios.bin
+%{_datadir}/%{name}/skiboot.lid
 %{_datadir}/%{name}/slof.bin
 %{_datadir}/%{name}/spapr-rtas.bin
 %{_datadir}/%{name}/vgabios.bin
@@ -1120,7 +1131,8 @@ fi
 %dir %{_libdir}/%{name}
 
 # modules without too many external dependencies
-%attr(755,root,root) %{_libdir}/%{name}/block-dmg.so
+%attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so
+%attr(755,root,root) %{_libdir}/%{name}/block-nfs.so
 
 %files img
 %defattr(644,root,root,755)
@@ -1129,7 +1141,7 @@ fi
 
 %files user
 %defattr(644,root,root,755)
-/usr/lib/binfmt.d/qemu-*.conf
+/usr/lib/binfmt.d/qemu-*-dynamic.conf
 %attr(755,root,root) %{_bindir}/qemu-aarch64
 %attr(755,root,root) %{_bindir}/qemu-alpha
 %attr(755,root,root) %{_bindir}/qemu-arm
@@ -1157,12 +1169,12 @@ 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-unicore32
 %attr(755,root,root) %{_bindir}/qemu-x86_64
 
 %if %{with user_static}
 %files user-static
 %defattr(644,root,root,755)
+/usr/lib/binfmt.d/qemu-*-static.conf
 %attr(755,root,root) %{_bindir}/qemu-aarch64-static
 %attr(755,root,root) %{_bindir}/qemu-alpha-static
 %attr(755,root,root) %{_bindir}/qemu-arm-static
@@ -1190,7 +1202,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-sparc32plus-static
 %attr(755,root,root) %{_bindir}/qemu-sparc64-static
 %attr(755,root,root) %{_bindir}/qemu-tilegx-static
-%attr(755,root,root) %{_bindir}/qemu-unicore32-static
 %attr(755,root,root) %{_bindir}/qemu-x86_64-static
 %endif