rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 345794 from home:a_faerber:qemu:2.4

Browse Source 
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
This commit is contained in:
Andreas Färber 2015-11-22 22:46:13 +00:00 committed by Git OBS Bridge
parent 4ed7c07745
commit 8d45187db7
5 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qemu-testsuite.changes
View File

@ -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

6
qemu-testsuite.spec
View File

@ -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

5
qemu.changes
View File

@ -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

6
qemu.spec
View File

@ -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

6
qemu.spec.in
View File

@ -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