Fix new Fedora third party software page

This commit is contained in:
Michael Catanzaro 2021-09-14 13:20:10 -05:00
parent 00806d1414
commit 55bea78a2b
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 8216a159cfefef94ebe6b0c83bd606389e943b6a Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
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

View File

@ -8,7 +8,7 @@
Name: gnome-initial-setup Name: gnome-initial-setup
Version: 41~rc Version: 41~rc
Release: 1%{?dist} Release: 2%{?dist}
Summary: Bootstrapping your OS Summary: Bootstrapping your OS
License: GPLv2+ 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 Source0: https://download.gnome.org/sources/%{name}/41/%{name}-%{tarball_version}.tar.xz
Source1: vendor.conf Source1: vendor.conf
# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/124
Patch0: fix-fedora-third-party.patch
BuildRequires: meson BuildRequires: meson
BuildRequires: gcc BuildRequires: gcc
BuildRequires: krb5-devel 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 %{_datadir}/gnome-initial-setup/vendor.conf
%changelog %changelog
* Tue Sep 14 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 41~rc-2
- Fix new Fedora third party software page
* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 41~rc-1 * Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 41~rc-1
- Update to 41.rc - Update to 41.rc