From f4d380ecd9f921299e571e08e788b20391d7f575 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 17 Sep 2021 12:02:12 +0200
Subject: [PATCH] Update to 41.0

---
 .gitignore                   |  1 +
 fix-fedora-third-party.patch | 32 --------------------------------
 gnome-initial-setup.spec     | 10 +++++-----
 sources                      |  2 +-
 4 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 fix-fedora-third-party.patch

diff --git a/.gitignore b/.gitignore
index 5190e83..805d0a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,4 @@
 /gnome-initial-setup-41.alpha.tar.xz
 /gnome-initial-setup-41.beta.tar.xz
 /gnome-initial-setup-41.rc.tar.xz
+/gnome-initial-setup-41.0.tar.xz
diff --git a/fix-fedora-third-party.patch b/fix-fedora-third-party.patch
deleted file mode 100644
index c14f4f3..0000000
--- a/fix-fedora-third-party.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index ad16d74..ccc94ef 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -7,8 +7,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gnome-initial-setup
-Version:        41~rc
-Release:        3%{?dist}
+Version:        41.0
+Release:        1%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
@@ -16,9 +16,6 @@ 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
@@ -107,6 +104,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/gnome-initial-setup/vendor.conf
 
 %changelog
+* Fri Sep 17 2021 Kalev Lember <klember@redhat.com> - 41.0-1
+- Update to 41.0
+
 * Tue Sep 14 2021 Kalev Lember <klember@redhat.com> - 41~rc-3
 - Disable parental controls support as per Workstation WG decision (#2004259)
 
diff --git a/sources b/sources
index 5576cf0..0b1ac97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-initial-setup-41.rc.tar.xz) = 2bcea2f208c95ff66d7371674cb9cc376bc0b86e1d1a9017b029387d8174d4870e09fe42b78e2f31db6005384b12398d47ba62d9279c605a872209416eaa8f1f
+SHA512 (gnome-initial-setup-41.0.tar.xz) = 5d340b764338801afbdf41c4ac7ef47b05db8457dbb639a3dd7ca6a5f650aec72da1e0ab8d57ac49f96211664464d85a76f7f1aa1ff0988ae0ac9f5e4d2225ad