From d10296b376496eb7eb3d35fde631e1310eb910f7237114da112ad1aa48fe9926 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Tue, 18 Jan 2011 16:27:30 +0000
Subject: [PATCH] Enabled yajl for suse_version >= 1140

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=88
---
 libvirt.changes |  5 +++++
 libvirt.spec    | 15 +++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/libvirt.changes b/libvirt.changes
index c5baaee..ded6ac3 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 18 09:25:18 MST 2011 - jfehlig@novell.com
+
+- Enabled yajl for suse_version >= 1140
+
 -------------------------------------------------------------------
 Fri Jan 14 15:39:16 MST 2011 - jfehlig@novell.com
 
diff --git a/libvirt.spec b/libvirt.spec
index b426f3b..ec51309 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -39,22 +39,22 @@
 %define with_selinux         1
 %define with_apparmor        0
 # options
-# still no yajl json library
-%define with_yajl            0
-%if 0%{?suse_version} >= 1130
-%define with_capng           1
-%else
-%define with_capng           0
 %endif
 %if 0%{?suse_version} >= 1140
+%define with_yajl            1
 %define with_netcf           1
 %define with_macvtap         1
 %define with_virtualport     1
 %else
+%define with_yajl            0
 %define with_netcf           0
 %define with_macvtap         0
 %define with_virtualport     0
 %endif
+%if 0%{?suse_version} >= 1130
+%define with_capng           1
+%else
+%define with_capng           0
 %if 0%{?suse_version} > 1110
 %define with_udev            1
 %define with_hal             0
@@ -158,6 +158,9 @@ Recommends:     logrotate
 Recommends:     dnsmasq
 Recommends:     open-iscsi
 Recommends:     nfs-client
+%if %{with_yajl}
+Requires:       libyajl
+%endif
 %if %{with_hal}
 Requires:       hal
 %endif