From bfbac8020085c74d932aa37934eb411e7529abcfc00b037e3e2aa7983e817fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Jan 2017 18:36:53 +0000 Subject: [PATCH] Accepting request 450179 from home:bfrogers:branches:Virtualization Really re-enable rbd/ceph for openSUSE this time. OBS-URL: https://build.opensuse.org/request/show/450179 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=327 --- qemu-testsuite.changes | 6 ++++++ qemu-testsuite.spec | 2 -- qemu.changes | 6 ++++++ qemu.spec | 2 -- qemu.spec.in | 2 -- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 402e30d8..95b923a4 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 13 17:21:25 UTC 2017 - brogers@suse.com + +- Despite the previous entry about re-enabling ceph on Nov 19, 2016 + the change wasn't actually done. Do it now. + ------------------------------------------------------------------- Wed Jan 11 17:36:17 UTC 2017 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index a74f7610..9b31f2fb 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -44,7 +44,6 @@ %endif %define noarch_supported 1110 -%if 0%{?is_opensuse} == 0 %ifarch x86_64 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && ( 0%{?is_opensuse} == 0 || 0%{?sle_version} > 120100 ) ) %define with_rbd 1 @@ -56,7 +55,6 @@ %define with_rbd 1 %endif %endif -%endif %if 0%{?suse_version} > 1320 %define with_seccomp 1 diff --git a/qemu.changes b/qemu.changes index 402e30d8..95b923a4 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 13 17:21:25 UTC 2017 - brogers@suse.com + +- Despite the previous entry about re-enabling ceph on Nov 19, 2016 + the change wasn't actually done. Do it now. + ------------------------------------------------------------------- Wed Jan 11 17:36:17 UTC 2017 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 730060a0..e6b1fe81 100644 --- a/qemu.spec +++ b/qemu.spec @@ -44,7 +44,6 @@ %endif %define noarch_supported 1110 -%if 0%{?is_opensuse} == 0 %ifarch x86_64 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && ( 0%{?is_opensuse} == 0 || 0%{?sle_version} > 120100 ) ) %define with_rbd 1 @@ -56,7 +55,6 @@ %define with_rbd 1 %endif %endif -%endif %if 0%{?suse_version} > 1320 %define with_seccomp 1 diff --git a/qemu.spec.in b/qemu.spec.in index 84b96c5c..01ec66d4 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -44,7 +44,6 @@ %endif %define noarch_supported 1110 -%if 0%{?is_opensuse} == 0 %ifarch x86_64 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && ( 0%{?is_opensuse} == 0 || 0%{?sle_version} > 120100 ) ) %define with_rbd 1 @@ -56,7 +55,6 @@ %define with_rbd 1 %endif %endif -%endif %if 0%{?suse_version} > 1320 %define with_seccomp 1