From 39bbd0de6701f632105db09f3230de8ac2306b35857b72515030402e63b58d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 22 Nov 2015 22:46:13 +0000 Subject: [PATCH] Accepting request 345794 from home:a_faerber:qemu:2.4 Fix SLE11 build OBS-URL: https://build.opensuse.org/request/show/345794 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=279 --- qemu-testsuite.changes | 5 +++++ qemu-testsuite.spec | 6 +++++- qemu.changes | 5 +++++ qemu.spec | 6 +++++- qemu.spec.in | 6 +++++- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 7b16371..95d59be 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 22 20:36:53 UTC 2015 - afaerber@suse.de + +- Fix SLE11 build by fixing systemd conditionalization (from olh) + ------------------------------------------------------------------- Thu Nov 19 11:23:26 UTC 2015 - tampakrap@opensuse.org diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 129aaa4..458cb48 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -894,9 +894,11 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules %endif %endif %endif -install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules +%if 0%{?with_systemd} +install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/qemu-ga.service +%endif %fdupes -s $RPM_BUILD_ROOT %else # qemu-testsuite @@ -1140,8 +1142,10 @@ fi %attr(755,root,kvm) %_bindir/qemu-ga %if 0%{?with_systemd} %{_unitdir}/qemu-ga.service +%endif %{_udevrulesdir}/80-qemu-ga.rules +%if 0%{?with_systemd} %files ksm %defattr(-, root, root) %{_unitdir}/ksm.service diff --git a/qemu.changes b/qemu.changes index 7b16371..95d59be 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 22 20:36:53 UTC 2015 - afaerber@suse.de + +- Fix SLE11 build by fixing systemd conditionalization (from olh) + ------------------------------------------------------------------- Thu Nov 19 11:23:26 UTC 2015 - tampakrap@opensuse.org diff --git a/qemu.spec b/qemu.spec index 726ce79..4ac64fd 100644 --- a/qemu.spec +++ b/qemu.spec @@ -894,9 +894,11 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules %endif %endif %endif -install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules +%if 0%{?with_systemd} +install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/qemu-ga.service +%endif %fdupes -s $RPM_BUILD_ROOT %else # qemu-testsuite @@ -1140,8 +1142,10 @@ fi %attr(755,root,kvm) %_bindir/qemu-ga %if 0%{?with_systemd} %{_unitdir}/qemu-ga.service +%endif %{_udevrulesdir}/80-qemu-ga.rules +%if 0%{?with_systemd} %files ksm %defattr(-, root, root) %{_unitdir}/ksm.service diff --git a/qemu.spec.in b/qemu.spec.in index 96fb409..e9323e2 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -816,9 +816,11 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules %endif %endif %endif -install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules +%if 0%{?with_systemd} +install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/qemu-ga.service +%endif %fdupes -s $RPM_BUILD_ROOT %else # qemu-testsuite @@ -1063,8 +1065,10 @@ fi %attr(755,root,kvm) %_bindir/qemu-ga %if 0%{?with_systemd} %{_unitdir}/qemu-ga.service +%endif %{_udevrulesdir}/80-qemu-ga.rules +%if 0%{?with_systemd} %files ksm %defattr(-, root, root) %{_unitdir}/ksm.service