Remove yajl daemon dep and replace with jansson

In libguestfs we removed the need to yajl back in libguestfs 1.40 (Feb
2018).  However this persisted in the spec file until now.  Remove the
yajl dep, but add the dep on jansson (the replacement json library
that we are using now).
This commit is contained in:
Richard W.M. Jones 2024-01-15 12:24:43 +00:00
parent 181f457c59
commit 1b8e34eb45

View File

@ -50,7 +50,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.52.0 Version: 1.52.0
Release: 4%{?dist} Release: 5%{?dist}
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
# Build only for architectures that have a kernel # Build only for architectures that have a kernel
@ -271,7 +271,6 @@ BuildRequires: util-linux
BuildRequires: vim-minimal BuildRequires: vim-minimal
BuildRequires: xfsprogs BuildRequires: xfsprogs
BuildRequires: xz BuildRequires: xz
BuildRequires: yajl
%if !0%{?rhel} %if !0%{?rhel}
BuildRequires: zerofree BuildRequires: zerofree
%endif %endif
@ -294,6 +293,7 @@ Requires: (%{name}-appliance = %{epoch}:%{version}-%{release} or %{name}-no
# The daemon dependencies are not included automatically, because it # The daemon dependencies are not included automatically, because it
# is buried inside the appliance, so list them here. # is buried inside the appliance, so list them here.
Requires: augeas-libs%{?_isa} >= 1.7.0 Requires: augeas-libs%{?_isa} >= 1.7.0
Requires: jansson%{?_isa}
Requires: libacl%{?_isa} Requires: libacl%{?_isa}
Requires: libcap%{?_isa} Requires: libcap%{?_isa}
Requires: libselinux%{?_isa} Requires: libselinux%{?_isa}
@ -301,7 +301,6 @@ Requires: hivex-libs%{?_isa} >= 1.3.10
Requires: pcre2%{?_isa} Requires: pcre2%{?_isa}
Requires: rpm-libs%{?_isa} >= 4.16.1.3 Requires: rpm-libs%{?_isa} >= 4.16.1.3
Requires: systemd-libs%{?_isa} Requires: systemd-libs%{?_isa}
Requires: yajl%{?_isa}
# For core mount-local (FUSE) API. # For core mount-local (FUSE) API.
Requires: fuse Requires: fuse
@ -1100,9 +1099,10 @@ rm ocaml/html/.gitignore
%changelog %changelog
* Mon Jan 15 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.0-4 * Mon Jan 15 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.0-5
- Use curl instead of wget, since wget2 is broken - Use curl instead of wget, since wget2 is broken
(https://gitlab.com/gnuwget/wget2/-/issues/652) (https://gitlab.com/gnuwget/wget2/-/issues/652)
- Remove yajl daemon dep and replace with jansson.
* Tue Jan 9 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.0-3 * Tue Jan 9 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.52.0-3
- Make cache directory find more robust - Make cache directory find more robust