[libvirt] Update to 1.2.2 release
Daniel P. Berrange
berrange at fedoraproject.org
Mon Mar 3 11:18:32 UTC 2014
commit 1b8b7567b1c9fa866968d953f6af69a347701490
Author: Daniel P. Berrange <berrange at redhat.com>
Date: Mon Mar 3 11:06:46 2014 +0000
Update to 1.2.2 release
Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
libvirt.spec | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
sources | 2 +-
2 files changed, 78 insertions(+), 7 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index e45588f..385b8f4 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -79,6 +79,7 @@
%define with_hyperv 0%{!?_without_hyperv:1}
%define with_xenapi 0%{!?_without_xenapi:1}
%define with_parallels 0%{!?_without_parallels:1}
+# No test for bhyve, because it does not build on Linux
# Then the secondary host drivers, which run inside libvirtd
%define with_interface 0%{!?_without_interface:%{server_drivers}}
@@ -98,7 +99,7 @@
%else
%define with_storage_sheepdog 0
%endif
-%if 0%{?fedora} >= 19
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
%define with_storage_gluster 0%{!?_without_storage_gluster:%{server_drivers}}
%else
%define with_storage_gluster 0
@@ -129,6 +130,8 @@
%define with_numad 0%{!?_without_numad:0}
%define with_firewalld 0%{!?_without_firewalld:0}
%define with_libssh2 0%{!?_without_libssh2:0}
+%define with_wireshark 0%{!?_without_wireshark:0}
+%define with_systemd_daemon 0%{!?_without_systemd_daemon:0}
# Non-server/HV driver defaults which are always enabled
%define with_sasl 0%{!?_without_sasl:1}
@@ -152,6 +155,13 @@
%define with_numactl 0
%endif
+# libgfapi is built only on x86_64 on rhel
+%ifnarch x86_64
+ %if 0%{?rhel} >= 6
+ %define with_storage_gluster 0
+ %endif
+%endif
+
# RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
# VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
# or HyperV.
@@ -171,6 +181,7 @@
# Fedora has systemd, libvirt still used sysvinit there.
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
%define with_systemd 1
+ %define with_systemd_daemon 1
%endif
# Fedora 18 / RHEL-7 are first where firewalld support is enabled
@@ -269,6 +280,11 @@
%define with_libssh2 0%{!?_without_libssh2:1}
%endif
+# Enable wireshark plugins for all distros shipping libvirt 1.2.2 or newer
+%if 0%{?fedora} >= 21
+ %define with_wireshark 0%{!?_without_wireshark:1}
+%endif
+
# Disable some drivers when building without libvirt daemon.
# The logic is the same as in configure.ac
%if ! %{with_libvirtd}
@@ -371,8 +387,8 @@
Summary: Library providing a simple virtualization API
Name: libvirt
-Version: 1.2.1
-Release: 2%{?dist}%{?extra_release}
+Version: 1.2.2
+Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -414,7 +430,9 @@ Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
%endif
+ %if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+ %endif
Requires: libvirt-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -436,6 +454,9 @@ BuildRequires: python
%if %{with_systemd}
BuildRequires: systemd-units
%endif
+%if %{with_systemd_daemon}
+BuildRequires: systemd-devel
+%endif
%if %{with_xen} || %{with_libxl}
BuildRequires: xen-devel
%endif
@@ -550,7 +571,7 @@ BuildRequires: parted-devel
BuildRequires: e2fsprogs-devel
%endif
%endif
-%if %{with_storage_mpath}
+%if %{with_storage_mpath} || %{with_storage_disk}
# For Multipath support
%if 0%{?rhel} == 5
# Broken RHEL-5 packaging has header files in main RPM :-(
@@ -558,13 +579,18 @@ BuildRequires: device-mapper
%else
BuildRequires: device-mapper-devel
%endif
- %if %{with_storage_rbd}
+%endif
+%if %{with_storage_rbd}
BuildRequires: ceph-devel
- %endif
%endif
%if %{with_storage_gluster}
+ %if 0%{?rhel} >= 6
+BuildRequires: glusterfs-api-devel >= 3.4.0
+BuildRequires: glusterfs-devel >= 3.4.0
+ %else
BuildRequires: glusterfs-api-devel >= 3.4.1
BuildRequires: glusterfs-devel >= 3.4.1
+ %endif
%endif
%if %{with_numactl}
# For QEMU/LXC numa info
@@ -631,6 +657,10 @@ BuildRequires: scrub
BuildRequires: numad
%endif
+%if %{with_wireshark}
+BuildRequires: wireshark-devel
+%endif
+
Provides: bundled(gnulib)
%description
@@ -708,6 +738,9 @@ Summary: Default configuration files for the libvirtd daemon
Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
+ %if %{with_driver_modules}
+Requires: libvirt-daemon-driver-network = %{version}-%{release}
+ %endif
%description daemon-config-network
Default configuration files for setting up NAT based networking
@@ -719,6 +752,9 @@ Summary: Network filter configuration files for the libvirtd daemon
Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
+ %if %{with_driver_modules}
+Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
+ %endif
%description daemon-config-nwfilter
Network filter configuration files for cleaning guest traffic
@@ -1115,6 +1151,17 @@ Requires: cyrus-sasl-md5
Shared libraries and client binaries needed to access to the
virtualization capabilities of recent versions of Linux (and other OSes).
+%if %{with_wireshark}
+%package wireshark
+Summary: Wireshark dissector plugin for libvirt RPC transactions
+Group: Development/Libraries
+Requires: wireshark
+Requires: %{name}-client = %{version}-%{release}
+
+%description wireshark
+Wireshark dissector plugin for better analysis of libvirt RPC traffic.
+%endif
+
%if %{with_lxc}
%package login-shell
Summary: Login shell for connecting users to an LXC container
@@ -1340,6 +1387,14 @@ driver
%define _with_firewalld --with-firewalld
%endif
+%if ! %{with_wireshark}
+ %define _without_wireshark --without-wireshark-dissector
+%endif
+
+%if ! %{with_systemd_daemon}
+ %define _without_systemd_daemon --without-systemd-daemon
+%endif
+
%define when %(date +"%%F-%%T")
%define where %(hostname)
%define who %{?packager}%{!?packager:Unknown}
@@ -1383,6 +1438,7 @@ driver
%{?_without_hyperv} \
%{?_without_vmware} \
%{?_without_parallels} \
+ --without-bhyve \
%{?_without_interface} \
%{?_without_network} \
%{?_with_rhel5_api} \
@@ -1412,6 +1468,8 @@ driver
%{?_without_dtrace} \
%{?_without_driver_modules} \
%{?_with_firewalld} \
+ %{?_without_wireshark} \
+ %{?_without_systemd_daemon} \
%{with_packager} \
%{with_packager_version} \
--with-qemu-user=%{qemu_user} \
@@ -1442,6 +1500,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a
%endif
+%if %{with_wireshark}
+rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
+%endif
%if %{with_network}
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
@@ -2117,6 +2178,11 @@ exit 0
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
%endif
+%if %{with_wireshark}
+%files wireshark
+%{_libdir}/wireshark/plugins/*/libvirt.so
+%endif
+
%if %{with_lxc}
%files login-shell
%attr(4750, root, virtlogin) %{_bindir}/virt-login-shell
@@ -2148,6 +2214,11 @@ exit 0
%doc examples/systemtap
%changelog
+* Mon Mar 3 2014 Daniel P. Berrange <berrange at redhat.com> - 1.2.2-1
+- Update to 1.2.2 release
+- Add wireshark plugin sub-RPM
+- Add missing sub-RPMs deps for config packages
+
* Mon Jan 27 2014 Cole Robinson <crobinso at redhat.com> - 1.2.1-2
- Rebuild for openwsman soname bump
diff --git a/sources b/sources
index 78a68b2..2c17e34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cce374220f67895afb6331bd2ddedbfd libvirt-1.2.1.tar.gz
+592958ad1ddce7574d8cb0a31e635acd libvirt-1.2.2.tar.gz
More information about the scm-commits
mailing list