X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt.spec;h=7b7de1733868508d04d71f0e18d12e35f675b9a3;hp=0a7d72652de4b951a753a0d6d6c69f643527998b;hb=7470b860cfb9847023a18a90d640e4ed229e6310;hpb=99a79a91e301c50ee0384d32c3c27108e850b2b4

diff --git a/libvirt.spec b/libvirt.spec
index 0a7d726..7b7de17 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -11,7 +11,6 @@
 %bcond_without	openvz		# OpenVZ support
 %bcond_without	phyp		# PHYP support
 %bcond_without	qemu		# Qemu support
-%bcond_without	uml		# UML support
 %bcond_without	vbox		# VirtualBox support
 %bcond_without	vmware		# VMware Workstation/Player support
 %bcond_without	xenapi		# Xen API (Citrix XenServer) support
@@ -41,12 +40,12 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	4.10.0
+Version:	5.1.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5:	f85067e830bd89db08b7b7ffa75db6ef
+# Source0-md5:	74c6c2e90ca9c94d9255eec338615a0c
 Source1:	libvirtd.init
 Source2:	virtlockd.init
 Source3:	virtlogd.init
@@ -120,6 +119,7 @@ Obsoletes:	libvirt-daemon-esx
 Obsoletes:	libvirt-daemon-hyperv
 Obsoletes:	libvirt-daemon-openvz
 Obsoletes:	libvirt-daemon-phyp
+Obsoletes:	libvirt-daemon-uml
 Obsoletes:	libvirt-daemon-vbox
 Obsoletes:	libvirt-daemon-vmware
 Obsoletes:	libvirt-daemon-xen
@@ -358,21 +358,6 @@ of the QEMU emulators.
 Sterownik wymagany po stronie serwera do zarządzania funkcjami
 wirtualizacji emulatora QEMU.
 
-%package daemon-uml
-Summary:	Server side driver required to run UML guests
-Summary(pl.UTF-8):	Sterownik wymagany po stronie serwera do uruchamiania gości UML
-Group:		Libraries
-Requires:	%{name}-daemon = %{version}-%{release}
-Provides:	libvirt(hypervisor)
-
-%description daemon-uml
-Server side driver required to manage the virtualization capabilities
-of UML.
-
-%description daemon-uml -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji UML.
-
 %package client
 Summary:	Client side utilities of the libvirt library
 Summary(pl.UTF-8):	Narzędzia klienckie do biblioteki libvirt
@@ -401,7 +386,6 @@ Requires:	%{name}-daemon = %{version}-%{release}
 %{?with_libxl:Requires:	%{name}-daemon-libxl = %{version}-%{release}}
 Requires:	%{name}-daemon-lxc = %{version}-%{release}
 Requires:	%{name}-daemon-qemu = %{version}-%{release}
-%{?with_uml:Requires:	%{name}-daemon-uml = %{version}-%{release}}
 
 %description utils
 Libvirt is a C toolkit to interact with the virtualization
@@ -536,7 +520,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 	--with-sasl \
 	--with-selinux \
 	--with-udev \
-	%{__with_without uml} \
 	%{__with_without vbox vbox %{_libdir}/VirtualBox} \
 	--with-virtualport \
 	%{__with_without vmware} \
@@ -572,8 +555,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
 %endif
 %if %{with wireshark}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la \
-	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.a} \
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.la \
+	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.a} \
 %endif
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/{bal,ilo,kw@kkcor,kw@uccor,kw_GB,tw,wba}
@@ -819,16 +802,6 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
 %endif
 
-%if %{with uml}
-%files daemon-uml
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_uml.so
-%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml
-%attr(700,root,root) %dir /var/lib/libvirt/uml
-%attr(700,root,root) %dir /var/run/libvirt/uml
-%attr(700,root,root) %dir /var/log/libvirt/uml
-%endif
-
 %files client
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
@@ -883,5 +856,5 @@ fi
 %if %{with wireshark}
 %files -n wireshark-libvirt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/wireshark/plugins/*/libvirt.so
+%attr(755,root,root) %{_libdir}/wireshark/plugins/*/epan/libvirt.so
 %endif