From 8a885589edca8232360a92eb2dca040c1fa34a7f Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Fri, 29 Nov 2013 17:19:03 +0100 Subject: [PATCH] Resolves: rhbz#1035548 - Disables the GOA page in new user mode --- 0001-Disable-GOA-page-in-new-user-mode.patch | 25 ++++++++++++++++++++ gnome-initial-setup.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-Disable-GOA-page-in-new-user-mode.patch diff --git a/0001-Disable-GOA-page-in-new-user-mode.patch b/0001-Disable-GOA-page-in-new-user-mode.patch new file mode 100644 index 0000000..5ef84d2 --- /dev/null +++ b/0001-Disable-GOA-page-in-new-user-mode.patch @@ -0,0 +1,25 @@ +From 93340174b7e13ec85ce82f299ffcd577a33902fa Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Fri, 29 Nov 2013 18:15:34 +0100 +Subject: [PATCH] Disable GOA page in new user mode + +--- + gnome-initial-setup/gnome-initial-setup.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c +index 0cb370a..145d3be 100644 +--- a/gnome-initial-setup/gnome-initial-setup.c ++++ b/gnome-initial-setup/gnome-initial-setup.c +@@ -105,6 +105,8 @@ should_skip_page (GisDriver *driver, + } + break; + case GIS_DRIVER_MODE_NEW_USER: ++ if (g_strcmp0 ("goa", page_id) == 0) ++ return TRUE; + default: + break; + } +-- +1.8.3.1 + diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index bfc178c..a1bc288 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -1,6 +1,6 @@ Name: gnome-initial-setup Version: 3.10.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bootstrapping your OS License: GPLv2+ @@ -14,6 +14,7 @@ Patch0: yelp-fixes.patch # upstream fix Patch1: goa-add.patch Patch2: 0001-goa-Prevent-a-use-after-free.patch +Patch3: 0001-Disable-GOA-page-in-new-user-mode.patch %global nm_version 0.9.6.4 %global glib_required_version 2.36.0 @@ -72,6 +73,7 @@ you through configuring it. It is integrated with gdm. %patch0 -p1 -b .yelp-fixes %patch1 -p1 -b .goa %patch2 -p1 +%patch3 -p1 autoreconf -i -f @@ -113,6 +115,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules %changelog +* Fri Nov 29 2013 Rui Matos - 3.10.1.1-4 +- Resolves: rhbz#1035548 - Disables the GOA page in new user mode + * Thu Nov 28 2013 Rui Matos - 3.10.1.1-3 - Resolves: rhbz#1027507 - [abrt] gnome-initial-setup-3.10.1.1-2.fc20: magazine_chain_pop_head