From 95022acffb3577a96a739c45c118e1c6bfcd8e27 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 22 Apr 2022 10:26:23 +0100
Subject: [PATCH] trivial: Fix Fedora CI

---
 .circleci/config.yml            | 2 +-
 contrib/ci/Dockerfile-fedora.in | 2 +-
 contrib/ci/fedora.sh            | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 479a006ec..c62f99deb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,7 +45,7 @@ jobs:
                                   mingw64-libarchive
                                   mingw64-json-glib
                                   mingw64-curl
-                                  wine && dnf install -y https://kojipkgs.fedoraproject.org/packages/glib2/2.72.0/2.fc36/i686/glib2-2.72.0-2.fc36.i686.rpm https://kojipkgs.fedoraproject.org/packages/glib2/2.72.0/2.fc36/x86_64/glib2-2.72.0-2.fc36.x86_64.rpm https://kojipkgs.fedoraproject.org/packages/glib2/2.72.0/2.fc36/x86_64/glib2-devel-2.72.0-2.fc36.x86_64.rpm
+                                  wine
       - checkout
       - run:
           name: "Build Win32"
diff --git a/contrib/ci/Dockerfile-fedora.in b/contrib/ci/Dockerfile-fedora.in
index c1cc3a8bb..6b1b97429 100644
--- a/contrib/ci/Dockerfile-fedora.in
+++ b/contrib/ci/Dockerfile-fedora.in
@@ -1,4 +1,4 @@
-FROM fedora:35
+FROM fedora:36
 %%%OS%%%
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
diff --git a/contrib/ci/fedora.sh b/contrib/ci/fedora.sh
index ae5ce455b..f9c3c26e3 100755
--- a/contrib/ci/fedora.sh
+++ b/contrib/ci/fedora.sh
@@ -6,7 +6,6 @@ set -x
 ./contrib/ci/fwupd_setup_helpers.py install-dependencies --yes -o fedora
 
 #generate a tarball
-git config tar.tar.xz.command "xz -c"
 mkdir -p build && pushd build
 rm -rf *
 
@@ -14,8 +13,6 @@ if [ "$QUBES" = "true" ]; then
     QUBES_MACRO=(--define "qubes_packages 1")
 fi
 
-dnf install -y python3-pip
-python3 -m pip install --user "meson >= 0.60.0"
 meson .. \
     -Ddocs=none \
     -Dman=true \