From 1170b2b9c1a0fc3fa5e9fcb20b0750565869ac17 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 27 Aug 2019 01:00:33 +0300 Subject: [PATCH] Update to 3.33.91 --- .gitignore | 1 + gnome-initial-setup.spec | 13 +++++++++---- honor-firstboot-disabled.patch | 6 +++--- sources | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7c2b697..11eb40c 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /gnome-initial-setup-3.32.1.tar.xz /gnome-initial-setup-3.33.2.tar.xz /gnome-initial-setup-3.33.4.tar.xz +/gnome-initial-setup-3.33.91.tar.xz diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 476eb39..a45f74d 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -5,8 +5,8 @@ %global geoclue_version 2.3.1 Name: gnome-initial-setup -Version: 3.33.4 -Release: 3%{?dist} +Version: 3.33.91 +Release: 1%{?dist} Summary: Bootstrapping your OS License: GPLv2+ @@ -80,7 +80,6 @@ you through configuring it. It is integrated with gdm. # desktop-file-validate %%{buildroot}/%%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop -desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/setup-shell.desktop mkdir -p %{buildroot}%{_datadir}/gnome-initial-setup cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/ @@ -101,15 +100,21 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop %{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop -%{_datadir}/gdm/greeter/applications/setup-shell.desktop %{_datadir}/gnome-session/sessions/gnome-initial-setup.session %{_datadir}/gnome-shell/modes/initial-setup.json %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules +%{_userunitdir}/gnome-initial-setup-copy-worker.service +%{_userunitdir}/gnome-initial-setup-first-login.service +%{_userunitdir}/gnome-initial-setup.service +%{_userunitdir}/gnome-welcome-tour.service %dir %{_datadir}/gnome-initial-setup %{_datadir}/gnome-initial-setup/vendor.conf %changelog +* Tue Aug 20 2019 Kalev Lember - 3.33.91-1 +- Update to 3.33.91 + * Thu Jul 25 2019 Fedora Release Engineering - 3.33.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/honor-firstboot-disabled.patch b/honor-firstboot-disabled.patch index d9cb406..3e7be5a 100644 --- a/honor-firstboot-disabled.patch +++ b/honor-firstboot-disabled.patch @@ -1,4 +1,4 @@ -From 56ee7759794f8b455563f795837df256bf35c193 Mon Sep 17 00:00:00 2001 +From d16992c2a18a623113b0de2d0c3e869dbca17821 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 23 Jan 2017 19:42:44 +0100 Subject: [PATCH] Exit gracefully if we are disabled systemwide @@ -70,7 +70,7 @@ index e2136de..280bd53 100644 * dont have a normal user session and need to initialize * the keyring manually so that we can pass the credentials diff --git a/meson.build b/meson.build -index 7b41505..8bf84db 100644 +index 4bad799..952c69e 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,7 @@ i18n = import('i18n') @@ -88,7 +88,7 @@ index 7b41505..8bf84db 100644 +conf.set_quoted('SYSCONFDIR', sysconf_dir) conf.set('ENABLE_REGION_PAGE', get_option('region-page')) conf.set('SECRET_API_SUBJECT_TO_CHANGE', true) - + conf.set_quoted('G_LOG_DOMAIN', 'InitialSetup') -- 2.21.0 diff --git a/sources b/sources index 7bd541e..ae21a63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-initial-setup-3.33.4.tar.xz) = ac655e7c671ec70fc84d3cc910341e04f9a4ad87b4eb688a923aada0a5fdb7ba5ac03e8458b9ce8a6cfff0be3b00ee1272eb6e50cea712a025fb5198e0c8fd69 +SHA512 (gnome-initial-setup-3.33.91.tar.xz) = 5536d92aa8cf9585ab8d528d3f509be803391e0a2c36cde15d966624c9f7173090c1f75fea7672662f00600d5163aa882508eff484c1e6a27f4e43d7d7e4780d