From 45973915620b2a5fde0645a170a7c2ff8946646f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 17 Feb 2020 16:58:23 +0100 Subject: [PATCH] Update to 3.35.91 --- .gitignore | 1 + gnome-initial-setup.spec | 7 +++++-- honor-firstboot-disabled.patch | 12 ++++++------ sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 65538bd..251be38 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /gnome-initial-setup-3.34.3.tar.xz /gnome-initial-setup-3.35.3.tar.xz /gnome-initial-setup-3.35.90.tar.xz +/gnome-initial-setup-3.35.91.tar.xz diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index ab5d791..db0f6e8 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -5,7 +5,7 @@ %global geoclue_version 2.3.1 Name: gnome-initial-setup -Version: 3.35.90 +Version: 3.35.91 Release: 1%{?dist} Summary: Bootstrapping your OS @@ -68,7 +68,7 @@ you through configuring it. It is integrated with gdm. %autosetup -p1 %build -%meson -Dsoftware-sources=enabled -Dvendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf +%meson -Dparental_controls=disabled -Dvendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf %meson_build %install @@ -108,6 +108,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || %{_datadir}/gnome-initial-setup/vendor.conf %changelog +* Mon Feb 17 2020 Kalev Lember - 3.35.91-1 +- Update to 3.35.91 + * Tue Feb 04 2020 Kalev Lember - 3.35.90-1 - Update to 3.35.90 diff --git a/honor-firstboot-disabled.patch b/honor-firstboot-disabled.patch index dcb7b1a..9b36297 100644 --- a/honor-firstboot-disabled.patch +++ b/honor-firstboot-disabled.patch @@ -1,4 +1,4 @@ -From 4fab9b35a44ea7012f2b0954ea7d578a0f98bae7 Mon Sep 17 00:00:00 2001 +From 05246c872f8ecb88b7e00d1bc4dcfae994b54594 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 @@ -18,10 +18,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=777707 2 files changed, 36 insertions(+) diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c -index 2c3836c..1cb2330 100644 +index 12625b8..c770980 100644 --- a/gnome-initial-setup/gnome-initial-setup.c +++ b/gnome-initial-setup/gnome-initial-setup.c -@@ -223,6 +223,31 @@ get_mode (void) +@@ -228,6 +228,31 @@ get_mode (void) return GIS_DRIVER_MODE_NEW_USER; } @@ -53,7 +53,7 @@ index 2c3836c..1cb2330 100644 int main (int argc, char *argv[]) { -@@ -259,6 +284,15 @@ main (int argc, char *argv[]) +@@ -268,6 +293,15 @@ main (int argc, char *argv[]) skipped_pages = g_ptr_array_new_with_free_func ((GDestroyNotify) gtk_widget_destroy); mode = get_mode (); @@ -70,7 +70,7 @@ index 2c3836c..1cb2330 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 e667997..1be4215 100644 +index eba28f0..031ea1f 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,7 @@ i18n = import('i18n') @@ -88,7 +88,7 @@ index e667997..1be4215 100644 +conf.set_quoted('SYSCONFDIR', sysconf_dir) conf.set('SECRET_API_SUBJECT_TO_CHANGE', true) conf.set_quoted('G_LOG_DOMAIN', 'InitialSetup') - + conf.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_64') -- 2.24.1 diff --git a/sources b/sources index 1b60efa..263f0cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-initial-setup-3.35.90.tar.xz) = 9cc765f4b6732ed110a45e10c7a8456aa6926e4e58e4407f98263c7470991795f46c9d0f4679e186e64944913f4fc1ed01f46e5966f17fc58dc9fc01cd45adfa +SHA512 (gnome-initial-setup-3.35.91.tar.xz) = 7d7077c667d8dd1c2d3df8061bb92fc8d6571730f9a93aa2da35f1de4adf69a29b67247c4264550fe6415c42ac9ce93740504c9c989b5daba9e5e9a506a25bf4