From 758e7e2f1f7f2d40af979bba5eb576e7a1068e7ef19715f52c20fd71bdc10f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 29 Apr 2016 17:51:01 +0000 Subject: [PATCH] Accepting request 392911 from home:a_faerber:branches:Virtualization - Check modules for conflicting release versions - Suggest recently added block modules OBS-URL: https://build.opensuse.org/request/show/392911 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=293 --- qemu-testsuite.changes | 6 ++++++ qemu-testsuite.spec | 17 +++++++++++++---- qemu.changes | 6 ++++++ qemu.spec | 17 +++++++++++++---- qemu.spec.in | 17 +++++++++++++---- 5 files changed, 51 insertions(+), 12 deletions(-) diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index f0ee499..5b6d83e 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 28 16:37:10 UTC 2016 - afaerber@suse.de + +- Check modules for conflicting release versions +- Suggest recently added block modules + ------------------------------------------------------------------- Thu Apr 28 15:12:18 UTC 2016 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index efd8929..7faeedf 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -274,6 +274,15 @@ Recommends: qemu-arm Suggests: qemu-arm %endif Suggests: qemu-block-dmg +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 +Suggests: qemu-block-gluster +%endif +%if 0%{?suse_version} > 1320 +Suggests: qemu-block-iscsi +%endif +%if 0%{?suse_version} > 1140 +Suggests: qemu-block-ssh +%endif Suggests: qemu-extra Suggests: qemu-lang %if 0%{?with_systemd} @@ -412,10 +421,10 @@ This sub-package contains translations. # Nor can we have modules require the right version of qemu and qemu-tools # as Xen reuses our qemu-tools but does not want our qemu and qemu-x86. %define qemu_module_conflicts \ -Conflicts: qemu < %version \ -Conflicts: qemu > %version \ -Conflicts: qemu-tools < %version \ -Conflicts: qemu-tools > %version +Conflicts: qemu < %version-%release \ +Conflicts: qemu > %version-%release \ +Conflicts: qemu-tools < %version-%release \ +Conflicts: qemu-tools > %version-%release %package block-curl Summary: Universal CPU emulator -- cURL block support diff --git a/qemu.changes b/qemu.changes index f0ee499..5b6d83e 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 28 16:37:10 UTC 2016 - afaerber@suse.de + +- Check modules for conflicting release versions +- Suggest recently added block modules + ------------------------------------------------------------------- Thu Apr 28 15:12:18 UTC 2016 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index a009fcf..80ebc35 100644 --- a/qemu.spec +++ b/qemu.spec @@ -274,6 +274,15 @@ Recommends: qemu-arm Suggests: qemu-arm %endif Suggests: qemu-block-dmg +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 +Suggests: qemu-block-gluster +%endif +%if 0%{?suse_version} > 1320 +Suggests: qemu-block-iscsi +%endif +%if 0%{?suse_version} > 1140 +Suggests: qemu-block-ssh +%endif Suggests: qemu-extra Suggests: qemu-lang %if 0%{?with_systemd} @@ -412,10 +421,10 @@ This sub-package contains translations. # Nor can we have modules require the right version of qemu and qemu-tools # as Xen reuses our qemu-tools but does not want our qemu and qemu-x86. %define qemu_module_conflicts \ -Conflicts: qemu < %version \ -Conflicts: qemu > %version \ -Conflicts: qemu-tools < %version \ -Conflicts: qemu-tools > %version +Conflicts: qemu < %version-%release \ +Conflicts: qemu > %version-%release \ +Conflicts: qemu-tools < %version-%release \ +Conflicts: qemu-tools > %version-%release %package block-curl Summary: Universal CPU emulator -- cURL block support diff --git a/qemu.spec.in b/qemu.spec.in index 5268411..212cf60 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -234,6 +234,15 @@ Recommends: qemu-arm Suggests: qemu-arm %endif Suggests: qemu-block-dmg +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 +Suggests: qemu-block-gluster +%endif +%if 0%{?suse_version} > 1320 +Suggests: qemu-block-iscsi +%endif +%if 0%{?suse_version} > 1140 +Suggests: qemu-block-ssh +%endif Suggests: qemu-extra Suggests: qemu-lang %if 0%{?with_systemd} @@ -372,10 +381,10 @@ This sub-package contains translations. # Nor can we have modules require the right version of qemu and qemu-tools # as Xen reuses our qemu-tools but does not want our qemu and qemu-x86. %define qemu_module_conflicts \ -Conflicts: qemu < %version \ -Conflicts: qemu > %version \ -Conflicts: qemu-tools < %version \ -Conflicts: qemu-tools > %version +Conflicts: qemu < %version-%release \ +Conflicts: qemu > %version-%release \ +Conflicts: qemu-tools < %version-%release \ +Conflicts: qemu-tools > %version-%release %package block-curl Summary: Universal CPU emulator -- cURL block support