4daedcf6c9
- Revert switch to jansson
boo#1104820
- Dropped:
temp-build-fix.patch
- Added:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch
- spec: don't restart libvirt-guests when updating libvirt-client
bsc#1104662
OBS-URL: https://build.opensuse.org/request/show/629264
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=701
38 lines
962 B
Diff
38 lines
962 B
Diff
commit 54f2b5e330aa20c9745b2545fc88973539015b98
|
|
Author: Ján Tomko <jtomko@redhat.com>
|
|
Date: Mon Aug 13 13:38:46 2018 +0200
|
|
|
|
Revert "util: jsoncompat: Stub out virJSONInitialize when compiling without jansson"
|
|
|
|
This reverts commit 9e44c2db8ad94d3c20acc1d081538c280af198b4.
|
|
|
|
Jansson cannot parse QEMU's quirky JSON.
|
|
Revert back to yajl.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1614569
|
|
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
|
Index: libvirt-4.6.0/src/util/virjsoncompat.c
|
|
===================================================================
|
|
--- libvirt-4.6.0.orig/src/util/virjsoncompat.c
|
|
+++ libvirt-4.6.0/src/util/virjsoncompat.c
|
|
@@ -271,15 +271,4 @@ json_true_impl(void)
|
|
return json_true_ptr();
|
|
}
|
|
|
|
-
|
|
-#else /* !WITH_JANSSON */
|
|
-
|
|
-
|
|
-int
|
|
-virJSONInitialize(void)
|
|
-{
|
|
- return 0;
|
|
-}
|
|
-
|
|
-
|
|
-#endif /* !WITH_JANSSON */
|
|
+#endif /* WITH_JANSSON */
|