Update to 41.rc

This commit is contained in:
Kalev Lember 2021-09-08 21:24:37 +02:00
parent f5d58b3dac
commit 00806d1414
4 changed files with 7 additions and 42 deletions

1
.gitignore vendored
View File

@ -90,3 +90,4 @@
/gnome-initial-setup-40.2.tar.xz
/gnome-initial-setup-41.alpha.tar.xz
/gnome-initial-setup-41.beta.tar.xz
/gnome-initial-setup-41.rc.tar.xz

View File

@ -1,36 +0,0 @@
From c7990f9bb41e9f67b3744d788fe8326dcdb17e6e Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 24 Aug 2021 21:49:07 +0200
Subject: [PATCH] Fix the polkit rule for Fedora third party setup
It turns out we need to match org.fedoraproject.thirdparty.run as the
fedora-third-party script is annotated that way.
https://bugzilla.redhat.com/show_bug.cgi?id=1996901
---
data/20-gnome-initial-setup.rules.in | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/data/20-gnome-initial-setup.rules.in b/data/20-gnome-initial-setup.rules.in
index bff0f21..02fd21d 100644
--- a/data/20-gnome-initial-setup.rules.in
+++ b/data/20-gnome-initial-setup.rules.in
@@ -15,13 +15,8 @@ polkit.addRule(function(action, subject) {
action.id.indexOf('org.freedesktop.accounts.') === 0 ||
action.id.indexOf('org.freedesktop.timedate1.') === 0 ||
action.id.indexOf('org.freedesktop.realmd.') === 0 ||
- action.id.indexOf('com.endlessm.ParentalControls.') === 0);
-
- // For the Software page. Feel free to add rules for your distro here.
- if (action.id === 'org.freedesktop.policykit.exec' &&
- action.lookup('program') === '@bindir@/fedora-third-party') {
- actionMatches = true;
- }
+ action.id.indexOf('com.endlessm.ParentalControls.') === 0 ||
+ action.id.indexOf('org.fedoraproject.thirdparty.') === 0);
if (actionMatches) {
if (subject.local)
--
2.31.1

View File

@ -7,8 +7,8 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-initial-setup
Version: 41~beta
Release: 3%{?dist}
Version: 41~rc
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
# Backported from upstream
Patch0: 0001-Fix-the-polkit-rule-for-Fedora-third-party-setup.patch
BuildRequires: meson
BuildRequires: gcc
BuildRequires: krb5-devel
@ -109,6 +106,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_datadir}/gnome-initial-setup/vendor.conf
%changelog
* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 41~rc-1
- Update to 41.rc
* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 41~beta-3
- Rebuild

View File

@ -1 +1 @@
SHA512 (gnome-initial-setup-41.beta.tar.xz) = 3e473f6b735ec9ebb502aea34c2fe1477f2e59be0f46586aa5bb385725cb9facbe972be2006a9a3471a607629596985db3b9f2fcfe2105401777b41d4503ed40
SHA512 (gnome-initial-setup-41.rc.tar.xz) = 2bcea2f208c95ff66d7371674cb9cc376bc0b86e1d1a9017b029387d8174d4870e09fe42b78e2f31db6005384b12398d47ba62d9279c605a872209416eaa8f1f