From d5e9f59804fff574535c6571cbd4df77eca990cc Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 9 Apr 2020 09:11:15 +0100 Subject: [PATCH] trivial: Use the official libjcat packages in the Fedora CI --- contrib/ci/Dockerfile-fedora.in | 1 - contrib/fwupd.spec.in | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/ci/Dockerfile-fedora.in b/contrib/ci/Dockerfile-fedora.in index 1fd649824..b8e18b6ec 100644 --- a/contrib/ci/Dockerfile-fedora.in +++ b/contrib/ci/Dockerfile-fedora.in @@ -6,7 +6,6 @@ ENV LC_ALL en_US.UTF-8 RUN echo fubar > /etc/machine-id RUN dnf -y update RUN echo fubar > /etc/machine-id -RUN dnf -y install https://kojipkgs.fedoraproject.org//packages/libjcat/0.1.0/1.fc31/x86_64/libjcat-0.1.0-1.fc31.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/libjcat/0.1.0/1.fc31/x86_64/libjcat-devel-0.1.0-1.fc31.x86_64.rpm %%%INSTALL_DEPENDENCIES_COMMAND%%% RUN dnf -y update glib2 glib2-devel --releasever=32 RUN mkdir /build diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in index f1654e2b4..348fcc810 100644 --- a/contrib/fwupd.spec.in +++ b/contrib/fwupd.spec.in @@ -2,6 +2,7 @@ %global libxmlb_version 0.1.3 %global libgusb_version 0.2.11 %global libsoup_version 2.51.92 +%global libjcat_version 0.1.0 %global systemd_version 231 %global json_glib_version 1.1.1 @@ -47,6 +48,7 @@ BuildRequires: libgcab1-devel BuildRequires: libgudev1-devel BuildRequires: libgusb-devel >= %{libgusb_version} BuildRequires: libsoup-devel >= %{libsoup_version} +BuildRequires: libjcat-devel >= %{libjcat_version} BuildRequires: polkit-devel >= 0.103 BuildRequires: sqlite-devel BuildRequires: gpgme-devel