From 4834e8abc569b1a9ad5742bd5ae383d869f81615d25078b6469f20541b1db232 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2020 17:36:37 +0000 Subject: [PATCH 1/2] Accepting request 796146 from home:qzhao:branches:GNOME:Factory Update gnome-initial-setup.spec: Drop the is_opensuse macro to eliminate in behavior in between SLE-15 and openSUSE-Leap (jsc#SLE-11857). OBS-URL: https://build.opensuse.org/request/show/796146 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-initial-setup?expand=0&rev=77 --- gnome-initial-setup.changes | 7 +++++++ gnome-initial-setup.spec | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gnome-initial-setup.changes b/gnome-initial-setup.changes index 79bbc49..b4fb50e 100644 --- a/gnome-initial-setup.changes +++ b/gnome-initial-setup.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 15 06:18:12 UTC 2020 - Cliff Zhao + +- Update gnome-initial-setup.spec: Drop the is_opensuse macro to + eliminate in behavior in between SLE-15 and openSUSE-Leap + (jsc#SLE-11857). + ------------------------------------------------------------------- Sat Mar 28 16:48:16 UTC 2020 - Bjørn Lie diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 380aa24..008eb41 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -69,7 +69,7 @@ Initial assistant, helping you to get the system up and running. %prep %setup -q -%if !0%{?is_opensuse} +%if 0%{?sle_version} >= 150200 %patch0 -p1 %endif @@ -82,7 +82,7 @@ Initial assistant, helping you to get the system up and running. %install %meson_install -%if !0%{?is_opensuse} +%if 0%{?sle_version} >= 150200 rm -rf %{buildroot}%{_libexecdir}/gnome-welcome-tour rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop %endif @@ -119,7 +119,7 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} || : %{_userunitdir}/gnome-session.target.wants/gnome-welcome-tour.service %dir %{_userunitdir}/gnome-session@gnome-initial-setup.target.wants %{_userunitdir}/gnome-session@gnome-initial-setup.target.wants/gnome-initial-setup.service -%if 0%{?is_opensuse} +%if 0%{?sle_version} < 150200 %{_libexecdir}/gnome-welcome-tour %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop %endif From 377d7e8f0a8d499a0e4fe6bf62d824278f3728dc61fd97b0e96ca4acf2630afe Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2020 17:42:10 +0000 Subject: [PATCH 2/2] Accepting request 798005 from GNOME:Next New stable release, not buildtested! OBS-URL: https://build.opensuse.org/request/show/798005 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-initial-setup?expand=0&rev=78 --- gnome-initial-setup-3.36.1.tar.xz | 3 --- gnome-initial-setup-3.36.2.tar.xz | 3 +++ gnome-initial-setup.changes | 7 +++++++ gnome-initial-setup.spec | 8 ++++---- 4 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 gnome-initial-setup-3.36.1.tar.xz create mode 100644 gnome-initial-setup-3.36.2.tar.xz diff --git a/gnome-initial-setup-3.36.1.tar.xz b/gnome-initial-setup-3.36.1.tar.xz deleted file mode 100644 index 754b611..0000000 --- a/gnome-initial-setup-3.36.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9199fd803dca8c283690bdf31b834e1eb649f701ebdb112b16cc6af4db32d6e9 -size 1143004 diff --git a/gnome-initial-setup-3.36.2.tar.xz b/gnome-initial-setup-3.36.2.tar.xz new file mode 100644 index 0000000..168864c --- /dev/null +++ b/gnome-initial-setup-3.36.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f8be41aea100c56dbf8f0fe1e2354d2d1ac05cf1c79a01cc975c6aa89145756 +size 1144808 diff --git a/gnome-initial-setup.changes b/gnome-initial-setup.changes index b4fb50e..dd0170b 100644 --- a/gnome-initial-setup.changes +++ b/gnome-initial-setup.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Apr 26 17:23:05 UTC 2020 - Bjørn Lie + +- Update to version 3.36.2: + + Bugs fixed: keyboard: Nullify pointers if getting layout fails. + + Updated translations. + ------------------------------------------------------------------- Wed Apr 15 06:18:12 UTC 2020 - Cliff Zhao diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 008eb41..2117b19 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-initial-setup # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ Name: gnome-initial-setup -Version: 3.36.1 +Version: 3.36.2 Release: 0 Summary: GNOME Initial Setup Assistant License: GPL-2.0-or-later Group: System/GUI/GNOME -Url: https://wiki.gnome.org/Design/OS/InitialSetup +URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/gnome-initial-setup/3.36/%{name}-%{version}.tar.xz # PATCH-FEATURE-SLE gnome-initial-setup-smarter.patch FATE#325763 FATE#321126 boo#1067288 bnc#1029083 qzhao@suse.com -- Investigate gnome-initial-setup, and make a Smarter gnome initial configuration. Patch0: gnome-initial-setup-smarter.patch + BuildRequires: krb5-devel BuildRequires: meson BuildRequires: pkgconfig @@ -73,7 +74,6 @@ Initial assistant, helping you to get the system up and running. %patch0 -p1 %endif - %build %meson \ -Dparental_controls=disabled \