From b6cb98ee0f1fefc5831d9e3b63b727414a750567 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 7 Jun 2022 09:43:17 +0100 Subject: Port from libsoup to libcurl The former bumped ABI, and all sorts of crazy happens when you link in libappstream-glib into a process with the 'other' ABI. It seems the universe has settled on curl as a dep; do the same. --- contrib/ci/Dockerfile-fedora | 2 +- contrib/libappstream-glib.spec.in | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/ci/Dockerfile-fedora b/contrib/ci/Dockerfile-fedora index ba97da5..930765d 100644 --- a/contrib/ci/Dockerfile-fedora +++ b/contrib/ci/Dockerfile-fedora @@ -15,7 +15,7 @@ RUN dnf -y install \ gtk-doc \ json-glib-devel \ libarchive-devel \ - libsoup-devel \ + libcurl-devel \ libstemmer-devel \ libuuid-devel \ libxslt \ diff --git a/contrib/libappstream-glib.spec.in b/contrib/libappstream-glib.spec.in index 0013caa..3c4dd0f 100644 --- a/contrib/libappstream-glib.spec.in +++ b/contrib/libappstream-glib.spec.in @@ -1,5 +1,4 @@ %global glib2_version 2.45.8 -%global libsoup_version 2.51.92 %global json_glib_version 1.1.1 %global gdk_pixbuf_version 2.31.5 %define alphatag #ALPHATAG# @@ -18,7 +17,7 @@ BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel BuildRequires: gperf BuildRequires: libarchive-devel -BuildRequires: libsoup-devel >= %{libsoup_version} +BuildRequires: libcurl-devel BuildRequires: gdk-pixbuf2-devel >= %{gdk_pixbuf_version} BuildRequires: gtk3-devel BuildRequires: gettext @@ -42,7 +41,6 @@ BuildRequires: docbook-style-xsl Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf_version} Requires: glib2%{?_isa} >= %{glib2_version} Requires: json-glib%{?_isa} >= %{json_glib_version} -Requires: libsoup%{?_isa} >= %{libsoup_version} # no longer required Obsoletes: appdata-tools < 0.1.9 -- cgit v1.2.1