- revert from jansson back to yajl, it is required for QEMU's quirky JSON

[packages/libvirt.git] / libvirt.spec

diff --git a/libvirt.spec b/libvirt.spec
index aacb4a8f980caa4ac20ac2971c261679d361414d..e24e7cca382b5e059d01d8723ab178b18a7006e3 100644 (file)
--- 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.5.0
+Version:       4.6.0
 Release:       2
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 692b2d00907438ed08a68813d3177cd3
+# 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} \
@@ -677,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