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

Accepting request 539838 from home:cbosdonnat:branches:Virtualization

Browse Source 
- Replace %{with_sle_build} by ! 0%{?is_opensuse}
  bsc#940315

OBS-URL: https://build.opensuse.org/request/show/539838
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=635
This commit is contained in:
Cédric Bosdonnat 2017-11-08 12:04:32 +00:00 committed by Git OBS Bridge
parent 1e0091f6a1
commit d43f869deb
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvirt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 8 11:04:04 UTC 2017 - cbosdonnat@suse.com
- Replace %{with_sle_build} by ! 0%{?is_opensuse}
bsc#940315
-------------------------------------------------------------------
Thu Nov 2 20:44:57 UTC 2017 - jfehlig@suse.com
@ -322,7 +328,6 @@ Wed Mar 22 08:30:55 UTC 2017 - cbosdonnat@suse.com
5dd607059-add-virNetDevGetName.patch
754515b7d-add-virNetlinkDumpCommand.patch
d68cb4f55-extract-the-request-sending-code-from-virNetlin.patch
-------------------------------------------------------------------
Thu Mar 16 14:23:16 UTC 2017 - jfehlig@suse.com

15
libvirt.spec
View File

@ -16,9 +16,6 @@
#
# The configuration of libvirt is modified slightly for SLE
%define with_sle_build %{?is_opensuse:0}%{!?is_opensuse:1}
# The hypervisor drivers that run in libvirtd
%define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1}
@ -64,7 +61,7 @@
%endif
# For SLE, further restrict Xen support to x86_64 only
%if %{with_sle_build}
%if ! 0%{?is_opensuse}
%ifarch %arm aarch64
%define with_xen 0
%define with_libxl 0
@ -90,7 +87,7 @@
%endif
# Disable hypervisor drivers not supported in SLE
%if %{with_sle_build}
%if ! 0%{?is_opensuse}
%define with_openvz 0
%define with_vbox 0
%define with_uml 0
@ -137,7 +134,7 @@
# libvirt commit 37397320 changed the configure check for wireshark to use
# pkgconfig. Currently only the Leap 42.2 and Factory wireshark-devel packages
# provide wireshark.pc. Disable the dissector for SLE and Leap <= 42.1
%if 0%{?sle_version} < 120200 && %{with_sle_build}
%if 0%{?sle_version} < 120200 && ! 0%{?is_opensuse}
%define with_wireshark 0
%endif
@ -339,7 +336,7 @@ Patch214: libvirt-suse-netcontrol.patch
Patch215: lxc-wait-after-eth-del.patch
Patch216: libxl-qemu-emulator-caps.patch
# SLES-Only patches
%if %{with_sle_build}
%if ! 0%{?is_opensuse}
Patch400: virt-create-rootfs.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -909,7 +906,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch214 -p1
%patch215 -p1
%patch216 -p1
%if %{with_sle_build}
%if ! 0%{?is_opensuse}
%patch400 -p1
%endif
@ -1514,7 +1511,7 @@ fi
%dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
%attr(0755, root, root) %{_bindir}/virt-lxc-convert
%if %{with_sle_build}
%if ! 0%{?is_opensuse}
%{_bindir}/virt-create-rootfs
%doc %{_mandir}/man1/virt-create-rootfs.1*
%endif