From 707c76b3785bc0b2d5b0557fabddf40d0cb7667ade8f34569a5225efc2815990 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Sep 2022 07:32:39 +0000 Subject: [PATCH] Accepting request 1002618 from GNOME:Next GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already) OBS-URL: https://build.opensuse.org/request/show/1002618 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=170 --- flatpak.changes | 8 ++++++++ flatpak.spec | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/flatpak.changes b/flatpak.changes index 2b6efa3..c480b0a 100644 --- a/flatpak.changes +++ b/flatpak.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 1 07:20:51 UTC 2022 - Bjørn Lie + +- Drop pkgconfig(libsoup-2.4) BuildRequires: rely on the curl + backend. Following this, pass --with-curl to configure. +- Add pkgconfig(libxml-2.0) BuildRequires, exsisting dependency, + previously pulled in by libsoup. + ------------------------------------------------------------------- Tue Aug 30 19:50:38 UTC 2022 - Andreas Stieger diff --git a/flatpak.spec b/flatpak.spec index 275829f..da26cb5 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -67,8 +67,8 @@ BuildRequires: pkgconfig(libarchive) >= 2.8.0 BuildRequires: pkgconfig(libcurl) >= 7.29.0 BuildRequires: pkgconfig(libelf) >= 0.8.12 BuildRequires: pkgconfig(libseccomp) -BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libxml-2.0) >= 2.4 BuildRequires: pkgconfig(libzstd) >= 0.8.1 BuildRequires: pkgconfig(ostree-1) >= 2020.8 BuildRequires: pkgconfig(polkit-gobject-1) @@ -151,6 +151,7 @@ sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-* %configure \ --disable-silent-rules \ --with-system-bubblewrap \ + --with-curl \ --with-priv-mode=none \ --with-dbus-config-dir=%{_dbusconfigdir} \ --with-system-dbus-proxy=%{_bindir}/xdg-dbus-proxy \