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

diff --git a/libvirt.spec b/libvirt.spec
index 7427013..21dcb6c 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,3 +1,7 @@
+# TODO:
+# - wireshark-dissector
+# - pldize virtlockd.init
+#
 # Conditional build:
 %bcond_without	ceph		# RADOS BD (Ceph) storage support
 %bcond_without	esx		# VMware ESX support
@@ -15,39 +19,39 @@
 %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
 %undefine	with_qemu
 %endif
+
 # Xen is available only on x86 and ia64
 %ifnarch %{ix86} %{x8664} ia64
 %undefine	with_xen
+%undefine	with_xenapi
+%undefine	with_libxl
 %endif
 
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	1.2.14
+Version:	2.1.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	983345c4ee6535437a6ba408dd59289a
+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:		libvirt-guests.init.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
@@ -60,7 +64,7 @@ BuildRequires:	cyrus-sasl-devel
 BuildRequires:	dbus-devel >= 1.0.0
 BuildRequires:	device-mapper-devel >= 1.0.0
 BuildRequires:	gawk
-BuildRequires:	gettext-devel >= 0.17
+BuildRequires:	gettext-tools >= 0.17
 %{?with_glusterfs:BuildRequires:	glusterfs-devel >= 3.4.1}
 BuildRequires:	gnutls-devel >= 1.0.25
 BuildRequires:	libapparmor-devel
@@ -79,11 +83,11 @@ BuildRequires:	libxslt-devel
 BuildRequires:	ncurses-devel
 %{?with_netcf:BuildRequires:	netcf-devel >= 0.2.0}
 BuildRequires:	numactl-devel
-BuildRequires:	openldap-devel
-BuildRequires:	openwsman-devel >= 2.2.3
+%{?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
@@ -102,7 +106,7 @@ Requires:	libpcap >= 1.0.0
 Requires:	libselinux >= 2.0.82
 Requires:	libssh2 >= 1.3
 Requires:	libxml2 >= 1:2.6.0
-Requires:	openwsman-libs >= 2.2.3
+%{?with_hyperv:Requires:	openwsman-libs >= 2.2.3}
 Obsoletes:	libvirt-daemon-esx
 Obsoletes:	libvirt-daemon-hyperv
 Obsoletes:	libvirt-daemon-openvz
@@ -156,7 +160,7 @@ Requires:	libpcap-devel >= 1.0.0
 Requires:	libselinux-devel >= 2.0.82
 Requires:	libxml2-devel >= 1:2.6.0
 Requires:	numactl-devel
-Requires:	openwsman-devel >= 2.2.3
+%{?with_hyperv:Requires:	openwsman-devel >= 2.2.3}
 %{?with_xen:Requires:	xen-devel >= 4.2}
 Requires:	yajl-devel
 
@@ -297,7 +301,7 @@ Requires:	/usr/bin/qemu-img
 Requires:	bzip2
 Requires:	gzip
 Requires:	lzop
-Requires:	qemu
+Requires:	qemu-system-x86
 Requires:	xz
 Provides:	libvirt(hypervisor)
 
@@ -331,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
@@ -370,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
@@ -402,15 +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
 
 %build
 %{__libtoolize}
@@ -451,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} \
@@ -508,13 +507,13 @@ Sondy systemtap/dtrace dla libvirt.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 
 %{__make} install \
 	DEVHELP_DIR=%{_gtkdocdir}/%{name}/devhelp \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
@@ -543,8 +542,6 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del libvirtd
 fi
 
-%postun daemon
-
 %post client
 /sbin/chkconfig --add libvirt-guests
 %service -n libvirt-guests restart
@@ -556,23 +553,22 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del libvirt-guests
 fi
 
-%postun client
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvirt-admin.so.0
 %if %{with lxc}
 %attr(755,root,root) %{_libdir}/libvirt-lxc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvirt-lxc.so.0
 %endif
-%if %{with qemu}
 %attr(755,root,root) %{_libdir}/libvirt-qemu.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvirt-qemu.so.0
-%endif
 
 %dir %{_libdir}/libvirt
 %dir %{_datadir}/libvirt
@@ -581,20 +577,23 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvirt.so
+%attr(755,root,root) %{_libdir}/libvirt-admin.so
 %{?with_lxc:%attr(755,root,root) %{_libdir}/libvirt-lxc.so}
-%{?with_qemu:%attr(755,root,root) %{_libdir}/libvirt-qemu.so}
+%attr(755,root,root) %{_libdir}/libvirt-qemu.so
 %{_datadir}/%{name}/api
 %{_gtkdocdir}/%{name}
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libvirt.pc
+%{_pkgconfigdir}/libvirt-admin.pc
 %{?with_lxc:%{_pkgconfigdir}/libvirt-lxc.pc}
-%{?with_qemu:%{_pkgconfigdir}/libvirt-qemu.pc}
+%{_pkgconfigdir}/libvirt-qemu.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libvirt.a
+%{_libdir}/libvirt-admin.a
 %{?with_lxc:%{_libdir}/libvirt-lxc.a}
-%{?with_qemu:%{_libdir}/libvirt-qemu.a}
+%{_libdir}/libvirt-qemu.a
 
 %if %{with sanlock}
 %files lock-sanlock
@@ -606,7 +605,6 @@ fi
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
 %dir /var/lib/libvirt/sanlock
 %{_mandir}/man8/virt-sanlock-cleanup.8*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf
 %endif
 
 %files daemon
@@ -616,36 +614,44 @@ 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/qemu-lockd.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
-%config(noreplace) %verify(not md5 mtime size) /usr/lib/sysctl.d/libvirtd.conf
+%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
 %attr(755,root,root) %{_libdir}/libvirt_parthelper
 %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
-%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.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
+%{_datadir}/polkit-1/rules.d/50-libvirt.rules
 %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
@@ -665,14 +671,20 @@ 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
 
 %if %{with libxl}
 %files daemon-libxl
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-lockd.conf
+%{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libxl-sanlock.conf}
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.libxl
 %attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
+%{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
 %attr(700,root,root) %dir /var/lib/libvirt/libxl
 %attr(700,root,root) %dir /var/run/libvirt/libxl
 %attr(700,root,root) %dir /var/log/libvirt/libxl
@@ -696,6 +708,8 @@ fi
 %files daemon-qemu
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-lockd.conf
+%{?with_sanlock:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/qemu-sanlock.conf}
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.qemu
 %attr(750,qemu,qemu) %dir /var/cache/libvirt/qemu
 %attr(750,qemu,qemu) %dir /var/lib/libvirt/qemu
@@ -728,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*