forked from pool/libvirt
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
83 lines
2.5 KiB
Diff
83 lines
2.5 KiB
Diff
commit 86db0db979c39df278f03dbf3b4239c873ddb637
|
|
Author: Ján Tomko <jtomko@redhat.com>
|
|
Date: Mon Aug 13 13:41:14 2018 +0200
|
|
|
|
Revert "build: add --with-jansson"
|
|
|
|
This reverts commit 12b34f094e2f1c7f414f4bb8f880a9d65c8fcd85.
|
|
|
|
Jansson cannot parse QEMU's quirky JSON.
|
|
Revert back to yajl.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1614569
|
|
|
|
Conflicts:
|
|
configure.ac:
|
|
Commit 8aa85e0b introduced LIBVIRT_*_LIBISCSI macros.
|
|
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
|
Index: libvirt-4.6.0/configure.ac
|
|
===================================================================
|
|
--- libvirt-4.6.0.orig/configure.ac
|
|
+++ libvirt-4.6.0/configure.ac
|
|
@@ -250,7 +250,6 @@ LIBVIRT_ARG_FIREWALLD
|
|
LIBVIRT_ARG_FUSE
|
|
LIBVIRT_ARG_GLUSTER
|
|
LIBVIRT_ARG_HAL
|
|
-LIBVIRT_ARG_JANSSON
|
|
LIBVIRT_ARG_LIBPCAP
|
|
LIBVIRT_ARG_LIBSSH
|
|
LIBVIRT_ARG_LIBXML
|
|
@@ -291,7 +290,6 @@ LIBVIRT_CHECK_FUSE
|
|
LIBVIRT_CHECK_GLUSTER
|
|
LIBVIRT_CHECK_GNUTLS
|
|
LIBVIRT_CHECK_HAL
|
|
-LIBVIRT_CHECK_JANSSON
|
|
LIBVIRT_CHECK_LIBNL
|
|
LIBVIRT_CHECK_LIBPARTED
|
|
LIBVIRT_CHECK_LIBPCAP
|
|
@@ -972,7 +970,6 @@ LIBVIRT_RESULT_FUSE
|
|
LIBVIRT_RESULT_GLUSTER
|
|
LIBVIRT_RESULT_GNUTLS
|
|
LIBVIRT_RESULT_HAL
|
|
-LIBVIRT_RESULT_JANSSON
|
|
LIBVIRT_RESULT_LIBNL
|
|
LIBVIRT_RESULT_LIBPCAP
|
|
LIBVIRT_RESULT_LIBSSH
|
|
Index: libvirt-4.6.0/m4/virt-jansson.m4
|
|
===================================================================
|
|
--- libvirt-4.6.0.orig/m4/virt-jansson.m4
|
|
+++ /dev/null
|
|
@@ -1,29 +0,0 @@
|
|
-dnl The jansson library
|
|
-dnl
|
|
-dnl This library is free software; you can redistribute it and/or
|
|
-dnl modify it under the terms of the GNU Lesser General Public
|
|
-dnl License as published by the Free Software Foundation; either
|
|
-dnl version 2.1 of the License, or (at your option) any later version.
|
|
-dnl
|
|
-dnl This library is distributed in the hope that it will be useful,
|
|
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
-dnl Lesser General Public License for more details.
|
|
-dnl
|
|
-dnl You should have received a copy of the GNU Lesser General Public
|
|
-dnl License along with this library. If not, see
|
|
-dnl <http://www.gnu.org/licenses/>.
|
|
-dnl
|
|
-
|
|
-AC_DEFUN([LIBVIRT_ARG_JANSSON],[
|
|
- LIBVIRT_ARG_WITH_FEATURE([JANSSON], [jansson], [check])
|
|
-])
|
|
-
|
|
-AC_DEFUN([LIBVIRT_CHECK_JANSSON],[
|
|
- dnl Jansson http://www.digip.org/jansson/
|
|
- LIBVIRT_CHECK_PKG([JANSSON], [jansson], [2.5])
|
|
-])
|
|
-
|
|
-AC_DEFUN([LIBVIRT_RESULT_JANSSON],[
|
|
- LIBVIRT_RESULT_LIB([JANSSON])
|
|
-])
|