diff --git a/.gitignore b/.gitignore index a56efc5..22fd918 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /gnome-initial-setup-3.33.91.tar.xz /gnome-initial-setup-3.33.92.tar.xz /gnome-initial-setup-3.34.0.tar.xz +/gnome-initial-setup-3.34.1.tar.xz diff --git a/0001-data-Disable-g-i-s-service-in-GDM.patch b/0001-data-Disable-g-i-s-service-in-GDM.patch deleted file mode 100644 index e08f6a4..0000000 --- a/0001-data-Disable-g-i-s-service-in-GDM.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b67b5cc48c418415eb3233f78ab089bc447b1952 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Mon, 9 Sep 2019 22:38:44 +0100 -Subject: [PATCH] data: Disable g-i-s service in GDM - -gnome-initial-setup should never run in GDM, add a conflict to prevent -this from happening. ---- - data/gnome-initial-setup-copy-worker.service.in | 3 +++ - data/gnome-initial-setup-first-login.service.in | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/data/gnome-initial-setup-copy-worker.service.in b/data/gnome-initial-setup-copy-worker.service.in -index 9b411d0..b7627d0 100644 ---- a/data/gnome-initial-setup-copy-worker.service.in -+++ b/data/gnome-initial-setup-copy-worker.service.in -@@ -4,6 +4,9 @@ Description=GNOME Initial Setup Copy Worker - # Make sure we run really early - Before=gnome-session-pre.target graphical-session-pre.target - -+# Never run in GDM -+Conflicts=gnome-session@gnome-login.target -+ - ConditionPathExists=!%E/gnome-initial-setup-done - - [Service] -diff --git a/data/gnome-initial-setup-first-login.service.in b/data/gnome-initial-setup-first-login.service.in -index 302753b..940395a 100644 ---- a/data/gnome-initial-setup-first-login.service.in -+++ b/data/gnome-initial-setup-first-login.service.in -@@ -7,6 +7,9 @@ After=gnome-session.target - # Together with Type=oneshot, make sure the welcome tour starts after setup - Before=gnome-welcome-tour.service - -+# Never run in GDM -+Conflicts=gnome-session@gnome-login.target -+ - Conflicts=gnome-session@gnome-initial-setup.target - ConditionPathExists=!%E/gnome-initial-setup-done - --- -2.21.0 - diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index c805a88..3ee0922 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.34.0 -Release: 2%{?dist} +Version: 3.34.1 +Release: 1%{?dist} Summary: Bootstrapping your OS License: GPLv2+ @@ -15,8 +15,6 @@ Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{versio Source1: vendor.conf Patch0: honor-firstboot-disabled.patch -Patch100: 0001-data-Disable-g-i-s-service-in-GDM.patch - BuildRequires: meson BuildRequires: gcc BuildRequires: krb5-devel @@ -110,6 +108,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %{_datadir}/gnome-initial-setup/vendor.conf %changelog +* Mon Oct 07 2019 Kalev Lember - 3.34.1-1 +- Update to 3.34.1 + * Mon Sep 09 2019 Benjamin Berg - 3.34.0-2 - Fix g-i-s starting in GDM Upstream MR https://gitlab.gnome.org/GNOME/gnome-initial-setup/merge_requests/59 diff --git a/sources b/sources index 09a1327..9c23707 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-initial-setup-3.34.0.tar.xz) = 8274ed750deac848df10f8108f999cb174665698adecb381524a3c24ec7817060960951f7844d1f15aa2e0153fc0c9b11ce73cc02e09006da84a46af1d3e7c12 +SHA512 (gnome-initial-setup-3.34.1.tar.xz) = 87c3bb2b558612cfabc5969f8defa4f62d5c5b2560561c1e73091805eaa6c9faf5e3dee49e292a95eb564a3f4dd794d9c7a36258d39aae68b865b603c5e77456