Update to 3.23.92

This commit is contained in:
Florian Müllner 2017-03-14 01:05:35 +01:00
parent fa937b2281
commit 57c35b881c
4 changed files with 12 additions and 162 deletions

1
.gitignore vendored
View File

@ -47,3 +47,4 @@
/gnome-initial-setup-3.22.0.tar.xz /gnome-initial-setup-3.22.0.tar.xz
/gnome-initial-setup-3.22.1.tar.xz /gnome-initial-setup-3.22.1.tar.xz
/gnome-initial-setup-3.23.1.tar.xz /gnome-initial-setup-3.23.1.tar.xz
/gnome-initial-setup-3.23.92.tar.xz

View File

@ -1,11 +1,12 @@
%global nm_version 0.9.6.4 %global nm_version 1.2
%global nma_version 1.0
%global glib_required_version 2.46.0 %global glib_required_version 2.46.0
%global gtk_required_version 3.11.3 %global gtk_required_version 3.11.3
%global geoclue_version 2.3.1 %global geoclue_version 2.3.1
Name: gnome-initial-setup Name: gnome-initial-setup
Version: 3.23.1 Version: 3.23.92
Release: 3%{?dist} Release: 1%{?dist}
Summary: Bootstrapping your OS Summary: Bootstrapping your OS
License: GPLv2+ License: GPLv2+
@ -18,9 +19,8 @@ BuildRequires: desktop-file-utils
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libpwquality-devel BuildRequires: libpwquality-devel
BuildRequires: pkgconfig(NetworkManager) >= %{nm_version} BuildRequires: pkgconfig(NetworkManager) >= %{nm_version}
BuildRequires: pkgconfig(libnm-glib) >= %{nm_version} BuildRequires: pkgconfig(libnm) >= %{nm_version}
BuildRequires: pkgconfig(libnm-util) >= %{nm_version} BuildRequires: pkgconfig(libnma) >= %{nma_version}
BuildRequires: pkgconfig(libnm-gtk)
BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-1.0)
@ -105,6 +105,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
%changelog %changelog
* Tue Mar 14 2017 Florian Müllner <fmuellner@redhat.com> - 3.23.92-1
- Update to 3.23.92
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.1-3 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

View File

@ -1,161 +1,7 @@
From 20266d351694633d125fc2f34d7738e8bbbd60bd Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 24 Jan 2017 19:19:30 +0100
Subject: [PATCH 1/3] summary: Move stamp file creation to a global function
This will be useful in other places. Note that the "done" stamp file
is now created in both existing user and new user modes.
https://bugzilla.gnome.org/show_bug.cgi?id=777707
---
gnome-initial-setup/gnome-initial-setup.c | 21 +++++++++++++++++
gnome-initial-setup/gnome-initial-setup.h | 2 ++
.../pages/summary/gis-summary-page.c | 26 +---------------------
3 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 396bbea..2ec91b9 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -242,3 +242,24 @@ main (int argc, char *argv[])
g_option_context_free (context);
return status;
}
+
+void
+gis_ensure_stamp_files (void)
+{
+ gchar *file;
+ GError *error = NULL;
+
+ file = g_build_filename (g_get_user_config_dir (), "run-welcome-tour", NULL);
+ if (!g_file_set_contents (file, "yes", -1, &error)) {
+ g_warning ("Unable to create %s: %s", file, error->message);
+ g_clear_error (&error);
+ }
+ g_free (file);
+
+ file = g_build_filename (g_get_user_config_dir (), "gnome-initial-setup-done", NULL);
+ if (!g_file_set_contents (file, "yes", -1, &error)) {
+ g_warning ("Unable to create %s: %s", file, error->message);
+ g_clear_error (&error);
+ }
+ g_free (file);
+}
diff --git a/gnome-initial-setup/gnome-initial-setup.h b/gnome-initial-setup/gnome-initial-setup.h
index 6dce853..dc5cf60 100644
--- a/gnome-initial-setup/gnome-initial-setup.h
+++ b/gnome-initial-setup/gnome-initial-setup.h
@@ -35,5 +35,7 @@ typedef struct _GisPage GisPage;
#include "gis-page.h"
#include "gis-keyring.h"
+void gis_ensure_stamp_files (void);
+
#endif /* __GNOME_INITIAL_SETUP_H__ */
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 2d5acf4..1c624d7 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -214,32 +214,9 @@ log_user_in (GisSummaryPage *page)
}
static void
-add_setup_done_file (void)
-{
- gchar *gis_done_path;
- GError *error = NULL;
-
- gis_done_path = g_build_filename (g_get_user_config_dir (),
- "gnome-initial-setup-done",
- NULL);
-
- if (!g_file_set_contents (gis_done_path, "yes", -1, &error)) {
- g_warning ("Unable to create %s: %s", gis_done_path, error->message);
- g_clear_error (&error);
- }
-
- g_free (gis_done_path);
-}
-
-static void
done_cb (GtkButton *button, GisSummaryPage *page)
{
- gchar *file;
-
- /* the tour is triggered by $XDG_CONFIG_HOME/run-welcome-tour */
- file = g_build_filename (g_get_user_config_dir (), "run-welcome-tour", NULL);
- g_file_set_contents (file, "yes", -1, NULL);
- g_free (file);
+ gis_ensure_stamp_files ();
switch (gis_driver_get_mode (GIS_PAGE (page)->driver))
{
@@ -248,7 +225,6 @@ done_cb (GtkButton *button, GisSummaryPage *page)
log_user_in (page);
break;
case GIS_DRIVER_MODE_EXISTING_USER:
- add_setup_done_file ();
g_application_quit (G_APPLICATION (GIS_PAGE (page)->driver));
default:
break;
--
2.9.3
From 7106bdb98479142acc5087da3a104df0235baaf6 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 24 Jan 2017 19:22:09 +0100
Subject: [PATCH 2/3] copy-worker: Copy the "done" stamp file too
For consistency, instead of creating the "done" stamp file here, we
can let g-i-s handle that and just copy it along with all the others.
https://bugzilla.gnome.org/show_bug.cgi?id=777707
---
gnome-initial-setup/gnome-initial-setup-copy-worker.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/gnome-initial-setup/gnome-initial-setup-copy-worker.c b/gnome-initial-setup/gnome-initial-setup-copy-worker.c
index 500d274..c041399 100644
--- a/gnome-initial-setup/gnome-initial-setup-copy-worker.c
+++ b/gnome-initial-setup/gnome-initial-setup-copy-worker.c
@@ -71,9 +71,7 @@ main (int argc,
{
GFile *src;
GFile *dest;
- GError *error = NULL;
char *initial_setup_homedir;
- gchar *gis_done_file_path;
initial_setup_homedir = get_gnome_initial_setup_home_dir ();
if (initial_setup_homedir == NULL)
@@ -90,17 +88,11 @@ main (int argc,
#define FILE(path) \
move_file_from_homedir (src, dest, path);
+ FILE (".config/gnome-initial-setup-done");
FILE (".config/run-welcome-tour");
FILE (".config/dconf/user");
FILE (".config/goa-1.0/accounts.conf");
FILE (".local/share/keyrings/login.keyring");
- gis_done_file_path = g_build_filename (g_get_user_config_dir (),
- "gnome-initial-setup-done",
- NULL);
-
- if (!g_file_set_contents (gis_done_file_path, "yes", -1, &error))
- g_warning ("Unable to create %s: %s", gis_done_file_path, error->message);
-
return EXIT_SUCCESS;
}
--
2.9.3
From b2659246f3e2afcbf51a92ee6839775de4e6487a Mon Sep 17 00:00:00 2001 From b2659246f3e2afcbf51a92ee6839775de4e6487a Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com> From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 23 Jan 2017 19:42:44 +0100 Date: Mon, 23 Jan 2017 19:42:44 +0100
Subject: [PATCH 3/3] Exit gracefully if we are disabled systemwide Subject: [PATCH] Exit gracefully if we are disabled systemwide
Sysadmins might want to disable any kind of initial setup for their Sysadmins might want to disable any kind of initial setup for their
users, perhaps because they pre-configure their environments. We users, perhaps because they pre-configure their environments. We

View File

@ -1 +1 @@
1e6777dc4101ddf2429b23c3c6417fdd gnome-initial-setup-3.23.1.tar.xz SHA512 (gnome-initial-setup-3.23.92.tar.xz) = 58937a7376afcba2431c41cd471762f344e23f4b69d288dd0470ce414ce4b90b5eb30d2bc5eb4dd20d6613a0ddd249c03722ed126e874dfc9ed6f40d5f2f482b