X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt.spec;h=6766c368d509c44bd774bb52776f682912ee76d8;hp=3ce435591415086054fc4c5ac631cd4d0baeb492;hb=fbb9ab96d6738f21cc7b5eb354ad24a6ecd635b5;hpb=0de36b90d8df943288cf5b4df9c8f136371b80cd

diff --git a/libvirt.spec b/libvirt.spec
index 3ce4355..6766c36 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,5 +1,5 @@
-#
 # TODO:
+# - wireshark-dissector
 # - seems that lxc patch is not needed anymore, verify that before removing
 # - pldize virtlockd.init
 #
@@ -29,22 +29,24 @@
 %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.9
-Release:	1
+Version:	1.2.17
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	f017075995062ff1d15577b0b093d02e
+# Source0-md5:	a1f49050223be3cbd7678c32b1ee2756
 Source1:	%{name}.init
-Source2:	%{name}.tmpfiles
 Patch0:		%{name}-sasl.patch
 Patch1:		%{name}-lxc.patch
 Patch2:		%{name}-qemu-acl.patch
@@ -53,7 +55,7 @@ Patch4:		virtlockd.init.patch
 Patch5:		%{name}-udevadm-settle.patch
 Patch6:		vserver.patch
 Patch7:		bashisms.patch
-Patch8:		libvirt-guests.init.patch
+Patch8:		%{name}-guests.init.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	audit-libs-devel
 BuildRequires:	augeas-devel
@@ -66,7 +68,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
@@ -86,7 +88,7 @@ BuildRequires:	ncurses-devel
 %{?with_netcf:BuildRequires:	netcf-devel >= 0.2.0}
 BuildRequires:	numactl-devel
 BuildRequires:	openldap-devel
-BuildRequires:	openwsman-devel >= 2.2.3
+%{?with_hyperv:BuildRequires:	openwsman-devel >= 2.2.3}
 BuildRequires:	parted-devel >= 1.8.0
 BuildRequires:	pkgconfig
 BuildRequires:	polkit
@@ -94,8 +96,8 @@ BuildRequires:	polkit
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.627
 %{?with_sanlock:BuildRequires:	sanlock-devel >= 0.8}
-BuildRequires:	systemd-devel
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
+BuildRequires:	sheepdog
 BuildRequires:	udev-devel >= 1:145
 %{?with_xen:BuildRequires:	xen-devel >= 4.2}
 # For disk driver
@@ -109,7 +111,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
@@ -163,7 +165,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
 
@@ -223,18 +225,15 @@ 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:	systemd-units >= 37-0.10
+Requires:	rc-scripts
+Requires:	sheepdog
 Requires:	udev-libs >= 1:145
 Requires:	util-linux
 Requires:	virtual(module-tools)
 Requires:	xorg-lib-libpciaccess >= 0.10.0
-Requires(post):	systemd-units
 Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	systemd-units
-Requires(preun):	systemd-units
 Suggests:	bridge-utils
 Suggests:	cyrus-sasl
 Suggests:	cyrus-sasl-digest-md5
@@ -253,7 +252,6 @@ Suggests:	parted >= 1.8.0
 Suggests:	polkit >= 0.93
 #Suggests:	radvd
 Suggests:	scrub
-#Suggests:	sheepdog
 Provides:	libvirt(hypervisor)
 
 %description daemon
@@ -308,7 +306,7 @@ Requires:	/usr/bin/qemu-img
 Requires:	bzip2
 Requires:	gzip
 Requires:	lzop
-Requires:	qemu
+Requires:	qemu-system-x86
 Requires:	xz
 Provides:	libvirt(hypervisor)
 
@@ -362,10 +360,7 @@ Requires:	gettext >= 0.18.1.1-6
 Requires:	gnutls >= 1.0.25
 Requires:	netcat-openbsd
 Requires:	rc-scripts
-Requires(post):	systemd-units
 Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	systemd-units
-Requires(preun):	systemd-units
 
 %description client
 Client binaries needed to access to the virtualization capabilities of
@@ -470,8 +465,8 @@ Sondy systemtap/dtrace dla libvirt.
 	%{?with_static_libs:--enable-static} \
 	--with-html-dir=%{_gtkdocdir} \
 	--with-html-subdir=%{name} \
-	--with-init-script=systemd+redhat \
-	--with-packager="PLD-Linux" \
+	--with-init-script=redhat \
+	--with-packager="TLD-Linux" \
 	--with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
 	--with-qemu-user=qemu \
 	--with-qemu-group=qemu \
@@ -522,16 +517,13 @@ Sondy systemtap/dtrace dla libvirt.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
-	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
 
 %{__make} install \
 	DEVHELP_DIR=%{_gtkdocdir}/%{name}/devhelp \
-	SYSTEMD_UNIT_DIR=%{systemdunitdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
-install %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+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 \
@@ -542,10 +534,6 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
 %endif
 
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{eu_ES,eu}
-# duplicate of vi, just one less message translated
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/vi_VN
-
 %find_lang %{name}
 
 %clean
@@ -557,34 +545,24 @@ rm -rf $RPM_BUILD_ROOT
 %post daemon
 /sbin/chkconfig --add libvirtd
 %service libvirtd restart
-%systemd_post libvirtd.service
 
 %preun daemon
 if [ "$1" = "0" ]; then
 	%service -q libvirtd stop
 	/sbin/chkconfig --del libvirtd
 fi
-%systemd_preun libvirtd.service
-
-%postun daemon
-%systemd_reload
 
 %post client
 /sbin/chkconfig --add libvirt-guests
 %service -n libvirt-guests restart
 NORESTART=1
-%systemd_post libvirt-guests.service
 
 %preun client
-%systemd_preun libvirt-guests.service
 if [ "$1" = "0" ]; then
 	%service -q libvirt-guests stop
 	/sbin/chkconfig --del libvirt-guests
 fi
 
-%postun client
-%systemd_reload
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO NEWS
@@ -592,14 +570,14 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf
 %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
@@ -608,20 +586,22 @@ 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
 %{?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
@@ -633,7 +613,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
@@ -644,7 +623,6 @@ fi
 %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/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,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
@@ -654,11 +632,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlockd
 %attr(754,root,root) /etc/rc.d/init.d/libvirtd
 %attr(754,root,root) /etc/rc.d/init.d/virtlockd
-%{systemdunitdir}/libvirtd.service
-%{systemdunitdir}/libvirtd.socket
-%{systemdunitdir}/virtlockd.service
-%{systemdunitdir}/virtlockd.socket
-%config(noreplace) %verify(not md5 mtime size) /usr/lib/sysctl.d/libvirtd.conf
+%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
@@ -669,11 +643,12 @@ fi
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
 %{_datadir}/augeas/lenses/virtlockd.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
 %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*
@@ -687,7 +662,6 @@ fi
 %attr(711,root,root) %dir /var/cache/libvirt
 %dir /var/run/libvirt
 %dir /var/run/libvirt/network
-%{systemdtmpfilesdir}/%{name}.conf
 %attr(755,root,root) %{_libexecdir}/libvirt_leaseshelper
 %dir %{_libdir}/libvirt/connection-driver
 %{_datadir}/libvirt/cpu_map.xml
@@ -698,15 +672,19 @@ fi
 %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
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox_network.so
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox_storage.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
@@ -730,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
@@ -760,7 +740,6 @@ fi
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
 %attr(754,root,root) /etc/rc.d/init.d/libvirt-guests
-%{systemdunitdir}/libvirt-guests.service
 %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-host-validate