diff --git a/fix-fedora-third-party.patch b/fix-fedora-third-party.patch new file mode 100644 index 0000000..c14f4f3 --- /dev/null +++ b/fix-fedora-third-party.patch @@ -0,0 +1,32 @@ +From 8216a159cfefef94ebe6b0c83bd606389e943b6a Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Tue, 14 Sep 2021 13:08:39 -0500 +Subject: [PATCH] software: call fedora-third-party properly + +I wrote this code before fedora-third-party existed, and tested it +against a dummy script. Well fedora-third-party exists now, and the +commands I used here are not the commands supported by the real script, +most like a typo on my part. Oops. +--- + gnome-initial-setup/pages/software/gis-software-page.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gnome-initial-setup/pages/software/gis-software-page.c b/gnome-initial-setup/pages/software/gis-software-page.c +index a29634b8..28f807b1 100644 +--- a/gnome-initial-setup/pages/software/gis-software-page.c ++++ b/gnome-initial-setup/pages/software/gis-software-page.c +@@ -91,9 +91,9 @@ gis_software_page_apply (GisPage *gis_page, + const char *arg1; + + if (gtk_switch_get_state (GTK_SWITCH (priv->proprietary_switch))) +- arg1 = "enabled"; ++ arg1 = "enable"; + else +- arg1 = "disabled"; ++ arg1 = "disable"; + + gis_pkexec (program, arg1, "root", &error); + if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +-- +2.31.1 + diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 7568e69..9107ce2 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -8,7 +8,7 @@ Name: gnome-initial-setup Version: 41~rc -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrapping your OS License: GPLv2+ @@ -16,6 +16,9 @@ URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/%{name}/41/%{name}-%{tarball_version}.tar.xz Source1: vendor.conf +# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/124 +Patch0: fix-fedora-third-party.patch + BuildRequires: meson BuildRequires: gcc BuildRequires: krb5-devel @@ -106,6 +109,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %{_datadir}/gnome-initial-setup/vendor.conf %changelog +* Tue Sep 14 2021 Michael Catanzaro - 41~rc-2 +- Fix new Fedora third party software page + * Wed Sep 08 2021 Kalev Lember - 41~rc-1 - Update to 41.rc