Update to 3.13.6

.gitignore

@@ -18,3 +18,4 @@
 /gnome-initial-setup-3.12.1.tar.xz
 /gnome-initial-setup-3.13.4.tar.xz
 /gnome-initial-setup-3.13.5.tar.xz
+/gnome-initial-setup-3.13.6.tar.xz

0001-keyboard-Include-all-layouts.patch

@@ -1,35 +0,0 @@
-From 198e3bbb080109188d21482214ca829ecbd19628 Mon Sep 17 00:00:00 2001
-From: Marcus Karlsson <mk@acc.umu.se>
-Date: Thu, 4 Sep 2014 22:34:27 +0200
-Subject: [PATCH 1/2] keyboard: Include all layouts
-
-Only a subset of all keyboard layouts are available from the keyboard
-page. It is impossible for some users to select the correct layout, and
-they are subsequently prevented from using the correct layout through
-the rest of the pages.
-
-Allow the user to select from all keyboard layouts.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=729208
----
- gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
-index 14c97a1..a48dcec 100644
---- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
-+++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
-@@ -385,6 +385,10 @@ get_locale_infos (CcInputChooser *chooser)
- 	add_rows_to_list (chooser, list, INPUT_SOURCE_TYPE_XKB, id);
- 	g_list_free (list);
- 
-+	list = gnome_xkb_info_get_all_layouts (priv->xkb_info);
-+	add_rows_to_list (chooser, list, INPUT_SOURCE_TYPE_XKB, id);
-+	g_list_free (list);
-+
-         gtk_widget_show_all (priv->input_list);
- 
- out:
--- 
-2.1.0
-

gnome-initial-setup.spec

@@ -1,14 +1,11 @@
 Name:           gnome-initial-setup
-Version:        3.13.5
-Release:        2%{?dist}
+Version:        3.13.6
+Release:        1%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
 URL:            https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup
 Source0:        http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz
-# Backport from upstream https://git.gnome.org/browse/gnome-initial-setup/commit/?id=198e3bbb080109188d21482214ca829ecbd19628
-# Ensure user can pick from full list of keyboard layouts
-Patch0:         0001-keyboard-Include-all-layouts.patch
 
 %global nm_version 0.9.6.4
 %global glib_required_version 2.36.0
@@ -67,7 +64,6 @@ you through configuring it. It is integrated with gdm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .all_layouts
 
 %build
 %configure
@@ -98,6 +94,7 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_libexecdir}/gnome-welcome-tour
 %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
+%{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
 
 %{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop
 %{_datadir}/gdm/greeter/applications/setup-shell.desktop
@@ -106,6 +103,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
+* Tue Sep 16 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.6-1
+- Update to 3.13.6
+
 * Mon Sep 08 2014 Adam Williamson <awilliam@redhat.com> - 3.13.5-2
 - backport upstream patch to offer full list of keyboard layouts (BGO #729208)
 

sources

@@ -1 +1 @@
-c3bfafd1d74af64eda0e4738bb46969d  gnome-initial-setup-3.13.5.tar.xz
+21c8bec70a647af8d2cb15f3c0a3b196  gnome-initial-setup-3.13.6.tar.xz