X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt.spec;h=e24e7cca382b5e059d01d8723ab178b18a7006e3;hb=440c6fd02965a2980ba2af8efad30e7e9513c435;hp=9397e1956f8b7a55b1f563b887626cdfa821247f;hpb=559d73a62a2eace9510788773fbe937c07c54b31;p=packages%2Flibvirt.git

diff --git a/libvirt.spec b/libvirt.spec
index 9397e19..e24e7cc 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -41,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.4.0
-Release:	1
+Version:	4.6.0
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5:	07376bcb6ae1d598285137c95caff6d0
+# Source0-md5:	6ea17a8f004a4bcdfc4beaed91fcdddd
 Source1:	libvirtd.init
 Source2:	virtlockd.init
 Source3:	virtlogd.init
@@ -56,6 +56,7 @@ Patch2:		%{name}-udevadm-settle.patch
 Patch3:		bashisms.patch
 Patch4:		%{name}-guests.init.patch
 Patch5:		%{name}-sysctl-dir.patch
+Patch6:		yajl.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -106,7 +107,6 @@ BuildRequires:	udev-devel >= 1:218
 %{?with_libxl:BuildRequires:	xen-devel >= 4.4}
 # For disk driver
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.10.0
-BuildRequires:	yajl-devel
 Requires:	curl-libs >= 7.18.0
 Requires:	device-mapper >= 1.0.0
 Requires:	libcap-ng >= 0.4.0
@@ -183,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}
-Requires:	yajl-devel
 
 %description devel
 Libvirt is a C toolkit to interact with the virtualization
@@ -451,6 +450,7 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -544,7 +544,6 @@ Moduł sekcji Wiresharka do pakietów libvirt.
 	%{__with_without vmware} \
 	%{!?with_wireshark:--without-wireshark-dissector} \
 	%{__with_without xenapi} \
-	--with-yajl \
 	--x-libraries=%{_libdir}
 
 %{__make} \
@@ -567,6 +566,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 \
@@ -577,6 +578,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
@@ -673,7 +676,9 @@ fi
 %attr(755,root,root) %{_libexecdir}/libvirt_sanlock_helper
 %attr(755,root,root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
+%if %{with qemu}
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
+%endif
 %dir /var/lib/libvirt/sanlock
 %{_mandir}/man8/virt-sanlock-cleanup.8*
 %endif
@@ -755,11 +760,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}
@@ -854,6 +862,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