X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt.spec;h=aacb4a8f980caa4ac20ac2971c261679d361414d;hp=acea98e35eb7fdd738b0091daef5b48f8748f9c9;hb=27c0d958f2db352502694bba430a157ad1610182;hpb=d139c6b6c09e77a47960a391fa2c8ee0b4fcdb81

diff --git a/libvirt.spec b/libvirt.spec
index acea98e..aacb4a8 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -15,7 +15,6 @@
 %bcond_without	vbox		# VirtualBox support
 %bcond_without	vmware		# VMware Workstation/Player support
 %bcond_without	xenapi		# Xen API (Citrix XenServer) support
-%bcond_without	xen		# Xen support
 # - storage
 %bcond_without	ceph		# RADOS BD (Ceph) storage support
 %bcond_without	glusterfs	# GlusterFS storage support
@@ -35,7 +34,6 @@
 
 # Xen is available only on x86 and ia64
 %ifnarch %{ix86} %{x8664} ia64
-%undefine	with_xen
 %undefine	with_xenapi
 %undefine	with_libxl
 %endif
@@ -43,12 +41,12 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	4.2.0
-Release:	1
+Version:	4.5.0
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5:	7dfbaeb30fc0ee1184c27a4b6c1d7254
+# Source0-md5:	692b2d00907438ed08a68813d3177cd3
 Source1:	libvirtd.init
 Source2:	virtlockd.init
 Source3:	virtlogd.init
@@ -105,7 +103,6 @@ BuildRequires:	rpmbuild(macros) >= 1.627
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
 BuildRequires:	udev-devel >= 1:218
 %{?with_wireshark:BuildRequires:	wireshark-devel >= 1.11.3}
-%{?with_xen:BuildRequires:	xen-devel >= 4.2}
 %{?with_libxl:BuildRequires:	xen-devel >= 4.4}
 # For disk driver
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.10.0
@@ -126,6 +123,7 @@ Obsoletes:	libvirt-daemon-openvz
 Obsoletes:	libvirt-daemon-phyp
 Obsoletes:	libvirt-daemon-vbox
 Obsoletes:	libvirt-daemon-vmware
+Obsoletes:	libvirt-daemon-xen
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -185,7 +183,6 @@ Requires:	libselinux-devel >= 2.5
 Requires:	libxml2-devel >= 1:2.6.0
 Requires:	numactl-devel
 %{?with_hyperv:Requires:	openwsman-devel >= 2.2.3}
-%{?with_xen:Requires:	xen-devel >= 4.2}
 Requires:	yajl-devel
 
 %description devel
@@ -378,23 +375,6 @@ of UML.
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
 wirtualizacji UML.
 
-%package daemon-xen
-Summary:	Server side driver required to run XEN guests
-Summary(pl.UTF-8):	Sterownik wymagany po stronie serwera do uruchamiania gości XEN
-Group:		Libraries
-Requires:	%{name}-daemon = %{version}-%{release}
-Requires:	/usr/sbin/qcow-create
-Requires:	xen
-Provides:	libvirt(hypervisor)
-
-%description daemon-xen
-Server side driver required to manage the virtualization capabilities
-of XEN.
-
-%description daemon-xen -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji XEN.
-
 %package client
 Summary:	Client side utilities of the libvirt library
 Summary(pl.UTF-8):	Narzędzia klienckie do biblioteki libvirt
@@ -424,7 +404,6 @@ Requires:	%{name}-daemon = %{version}-%{release}
 Requires:	%{name}-daemon-lxc = %{version}-%{release}
 Requires:	%{name}-daemon-qemu = %{version}-%{release}
 %{?with_uml:Requires:	%{name}-daemon-uml = %{version}-%{release}}
-Requires:	%{name}-daemon-xen = %{version}-%{release}
 
 %description utils
 Libvirt is a C toolkit to interact with the virtualization
@@ -564,7 +543,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 	--with-virtualport \
 	%{__with_without vmware} \
 	%{!?with_wireshark:--without-wireshark-dissector} \
-	%{__with_without xen} \
 	%{__with_without xenapi} \
 	--with-yajl \
 	--x-libraries=%{_libdir}
@@ -589,6 +567,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la \
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la \
+	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a}
 
 %if %{with sanlock}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \
@@ -599,6 +579,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \
 %endif
 
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba}
+
 %find_lang %{name}
 
 %clean
@@ -777,11 +759,14 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
+%dir %{_libdir}/libvirt/storage-file
+%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
 
 %if %{with glusterfs}
 %files daemon-storage-gluster
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so
+%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so
 %endif
 
 %if %{with ceph}
@@ -845,12 +830,6 @@ fi
 %attr(700,root,root) %dir /var/log/libvirt/uml
 %endif
 
-%if %{with xen}
-%files daemon-xen
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_xen.so
-%endif
-
 %files client
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
@@ -882,6 +861,8 @@ fi
 %{_datadir}/libvirt/schemas/networkcommon.rng
 %{_datadir}/libvirt/schemas/nodedev.rng
 %{_datadir}/libvirt/schemas/nwfilter.rng
+%{_datadir}/libvirt/schemas/nwfilter_params.rng
+%{_datadir}/libvirt/schemas/nwfilterbinding.rng
 %{_datadir}/libvirt/schemas/secret.rng
 %{_datadir}/libvirt/schemas/storagecommon.rng
 %{_datadir}/libvirt/schemas/storagepool.rng