X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt.spec;h=21dcb6c131f302622c0f53cac965fa5f5589eea8;hp=12ddee0b4038b1ef5e937b5342f972b41686e050;hb=5362742718a035681452094c18259125ad56676e;hpb=266c31e3316a6ce3aedea22ed1e45722a1e6596b

diff --git a/libvirt.spec b/libvirt.spec
index 12ddee0..21dcb6c 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,6 +1,5 @@
 # TODO:
 # - wireshark-dissector
-# - seems that lxc patch is not needed anymore, verify that before removing
 # - pldize virtlockd.init
 #
 # Conditional build:
@@ -20,10 +19,10 @@
 %bcond_without	uml		# UML support
 %bcond_without	vbox		# VirtualBox support
 %bcond_without	vmware		# VMware Workstation/Player support
-%bcond_with	vserver		# Support for Linux-VServer guests
 %bcond_without	xenapi		# Xen API (Citrix XenServer) support
 %bcond_without	xen		# Xen support
 %bcond_without	static_libs	# static libraries build
+%bcond_without	ldap		# don't require openldap-devel
 
 # qemu available only on x86 and ppc
 %ifnarch %{ix86} %{x8664} ppc
@@ -40,23 +39,19 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	1.2.21
+Version:	2.1.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	76ab39194302b9067332e1f619c8bad9
+Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
+# Source0-md5:	fd1c054a8b59235e877efb728de79386
 Source1:	%{name}.init
 Patch0:		%{name}-sasl.patch
-Patch1:		%{name}-lxc.patch
-Patch2:		%{name}-qemu-acl.patch
-Patch3:		%{name}-xend.patch
-Patch4:		virtlockd.init.patch
-Patch5:		%{name}-udevadm-settle.patch
-Patch6:		vserver.patch
-Patch7:		bashisms.patch
-Patch8:		%{name}-guests.init.patch
-Patch9:		%{name}-sysctl-dir.patch
+Patch1:		%{name}-qemu-acl.patch
+Patch2:		%{name}-udevadm-settle.patch
+Patch3:		bashisms.patch
+Patch4:		%{name}-guests.init.patch
+Patch5:		%{name}-sysctl-dir.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	audit-libs-devel
 BuildRequires:	augeas-devel
@@ -88,17 +83,16 @@ BuildRequires:	libxslt-devel
 BuildRequires:	ncurses-devel
 %{?with_netcf:BuildRequires:	netcf-devel >= 0.2.0}
 BuildRequires:	numactl-devel
-BuildRequires:	openldap-devel
+%{?with_ldap:BuildRequires:	openldap-devel}
 %{?with_hyperv:BuildRequires:	openwsman-devel >= 2.2.3}
 BuildRequires:	parted-devel >= 1.8.0
 BuildRequires:	pkgconfig
-BuildRequires:	polkit
+%{?with_polkit:BuildRequires:	polkit}
 %{?with_polkit:BuildRequires:	polkit-devel >= 0.90}
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.627
 %{?with_sanlock:BuildRequires:	sanlock-devel >= 0.8}
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
-BuildRequires:	sheepdog
 BuildRequires:	udev-devel >= 1:145
 %{?with_xen:BuildRequires:	xen-devel >= 4.2}
 # For disk driver
@@ -226,10 +220,9 @@ Requires:	iproute2
 Requires:	libblkid >= 2.17
 %{?with_netcf:Requires:	netcf >= 0.2.0}
 Requires:	parted-libs >= 1.8.0
+Requires:	rc-scripts
 # Needed for probing the power management features of the host.
 Requires:	pm-utils
-Requires:	rc-scripts
-Requires:	sheepdog
 Requires:	udev-libs >= 1:145
 Requires:	util-linux
 Requires:	virtual(module-tools)
@@ -253,6 +246,7 @@ Suggests:	parted >= 1.8.0
 Suggests:	polkit >= 0.93
 #Suggests:	radvd
 Suggests:	scrub
+#Suggests:	sheepdog
 Provides:	libvirt(hypervisor)
 
 %description daemon
@@ -341,7 +335,6 @@ Group:		Libraries
 Requires:	%{name}-daemon = %{version}-%{release}
 Requires:	/usr/sbin/qcow-create
 Requires:	xen
-Requires:	xen-xend
 Provides:	libvirt(hypervisor)
 
 %description daemon-xen
@@ -380,7 +373,7 @@ 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}
-Requires:	%{name}-daemon-uml = %{version}-%{release}
+%{?with_uml:Requires:	%{name}-daemon-uml = %{version}-%{release}}
 Requires:	%{name}-daemon-xen = %{version}-%{release}
 
 %description utils
@@ -412,16 +405,11 @@ Sondy systemtap/dtrace dla libvirt.
 %prep
 %setup -q
 %patch0 -p1
-# TODO
-#patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%{?with_vserver:%patch6 -p1}
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 %{__libtoolize}
@@ -462,7 +450,7 @@ Sondy systemtap/dtrace dla libvirt.
 	SCRUB=/usr/bin/scrub \
 	OVSVSCTL=/usr/bin/ovs-vsctl \
 	NUMAD=/usr/bin/numad \
-	COLLIE=/usr/sbin/collie \
+	SHEEPDOGCLI=/usr/sbin/collie \
 	--disable-silent-rules \
 	%{?with_static_libs:--enable-static} \
 	--with-html-dir=%{_gtkdocdir} \
@@ -570,6 +558,7 @@ fi
 %doc ChangeLog README TODO NEWS
 %dir %{_sysconfdir}/libvirt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
+%attr(755,root,root) %{_libdir}/libnss_libvirt.so.?
 %attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvirt.so.0
 %attr(755,root,root) %{_libdir}/libvirt-admin.so.*.*.*
@@ -595,6 +584,7 @@ fi
 %{_gtkdocdir}/%{name}
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libvirt.pc
+%{_pkgconfigdir}/libvirt-admin.pc
 %{?with_lxc:%{_pkgconfigdir}/libvirt-lxc.pc}
 %{_pkgconfigdir}/libvirt-qemu.pc
 
@@ -624,16 +614,20 @@ fi
 %dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu
 %dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks
 %dir %attr(700,root,root) %{_sysconfdir}/libvirt/qemu/networks/autostart
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt-admin.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlockd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virtlogd.conf
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/default.xml
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/nwfilter/*.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sasl/libvirt.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirtd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlockd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlogd
 %attr(754,root,root) /etc/rc.d/init.d/libvirtd
 %attr(754,root,root) /etc/rc.d/init.d/virtlockd
+%attr(754,root,root) /etc/rc.d/init.d/virtlogd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysctl.d/60-libvirtd.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd
 %attr(755,root,root) %{_libdir}/libvirt_iohelper
@@ -641,12 +635,15 @@ fi
 %attr(755,root,root) %{_libdir}/virt-aa-helper
 %attr(755,root,root) %{_sbindir}/libvirtd
 %attr(755,root,root) %{_sbindir}/virtlockd
+%attr(755,root,root) %{_sbindir}/virtlogd
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
 %{_datadir}/augeas/lenses/virtlockd.aug
+%{_datadir}/augeas/lenses/virtlogd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
 %{?with_qemu:%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug}
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlogd.aug
 %if %{with polkit}
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
@@ -654,6 +651,7 @@ fi
 %endif
 %{_mandir}/man8/libvirtd.8*
 %{_mandir}/man8/virtlockd.8*
+%{_mandir}/man8/virtlogd.8*
 %dir /var/lib/libvirt
 %dir /var/lib/libvirt/dnsmasq
 %attr(711,root,root) %dir /var/lib/libvirt/boot
@@ -673,7 +671,7 @@ fi
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
+%{?with_vbox:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so}
 %dir %{_libdir}/libvirt/lock-driver
 %attr(755,root,root) %{_libdir}/libvirt/lock-driver/lockd.so
 
@@ -744,12 +742,14 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/libvirt-guests
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virt-login-shell.conf
 %attr(755,root,root) %{_bindir}/virsh
+%attr(755,root,root) %{_bindir}/virt-admin
 %attr(755,root,root) %{_bindir}/virt-host-validate
 %attr(4755,root,root) %{_bindir}/virt-login-shell
 %attr(755,root,root) %{_bindir}/virt-xml-validate
 %attr(755,root,root) %{_bindir}/virt-pki-validate
 %attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
 %{_mandir}/man1/virsh.1*
+%{_mandir}/man1/virt-admin.1*
 %{_mandir}/man1/virt-host-validate.1*
 %{_mandir}/man1/virt-login-shell.1*
 %{_mandir}/man1/virt-xml-validate.1*