diff --git a/159.patch b/159.patch deleted file mode 100644 index 7d4d411..0000000 --- a/159.patch +++ /dev/null @@ -1,421 +0,0 @@ -From ab0636afe1622373fd9f0d5b9a55f7a4da6a4c3d Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Tue, 6 Sep 2022 14:34:00 +0100 -Subject: [PATCH 1/5] account: Show actions in enterprise login dialog - -Since 13de947f4ff3444e7085007ff353e97bd74832ae ("account: Port to GTK4") -this GtkBox would obliterate the default contents of the dialog, and as -a result the action widgets were not shown. - -Correctly pack the dialog contents into the content area. - -Fixes https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/152 - -Part-of: ---- - .../pages/account/gis-account-page-enterprise.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -index aca904a4..b2556837 100644 ---- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -@@ -124,7 +124,7 @@ - True - True - -- -+ - - vertical - 2 --- -GitLab - - -From 4dd82319e1cc608506bbc0c6b2ac5f28d5b36cd3 Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Tue, 6 Sep 2022 14:41:33 +0100 -Subject: [PATCH 2/5] account: Fix buttons in enterprise login dialog - -Since 13de947f4ff3444e7085007ff353e97bd74832ae ("account: Port to GTK4") -the label on the cancel button was lost, as was the use_underline property -for the continue button. - -gtk-cancel is no more, but happily the translatable string "_Cancel" is -already present elsewhere in this project. - -While we are here, mark the Continue button as the suggested action. - -Part-of: ---- - .../pages/account/gis-account-page-enterprise.ui | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -index b2556837..38992f05 100644 ---- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -@@ -261,11 +261,18 @@ - - - -- -+ -+ _Cancel -+ True -+ - - - - C_ontinue -+ True -+ - - - --- -GitLab - - -From 1e5bb1eb5f8074768805f88107f258898dfff3b7 Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Tue, 6 Sep 2022 14:44:11 +0100 -Subject: [PATCH 3/5] account: Readd margin to enterprise login dialog - -In 13de947f4ff3444e7085007ff353e97bd74832ae ("account: Port to GTK4") -the use of GtkContainer:border-width was removed, but no alternative -margin was added. Readd a margin. This margin is a little wider but I -think looks fine, and is the same used in at least one dialog in -gnome-control-center. - -Part-of: ---- - .../pages/account/gis-account-page-enterprise.ui | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -index 38992f05..01379314 100644 ---- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -@@ -131,6 +131,10 @@ - - - vertical -+ 18 -+ 18 -+ 18 -+ 18 - 10 - - --- -GitLab - - -From ac1514d95f019cc54934ec17eb0521f911871d42 Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Tue, 6 Sep 2022 14:59:23 +0100 -Subject: [PATCH 4/5] account: Set title on enterprise login dialog - -While not strictly necessary, this is a moderate visual improvement. - -Part-of: ---- - .../pages/account/gis-account-page-enterprise.ui | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) - -diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -index 01379314..c53d8a62 100644 ---- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -@@ -123,7 +123,7 @@ - False - True - True -- -+ Domain Administrator Login - - - vertical -@@ -136,15 +136,6 @@ - 18 - 18 - 10 -- -- -- Domain Administrator Login -- -- -- -- -- -- - - - 0.5 --- -GitLab - - -From 721491856f8e9b2d5003937ad73d87c17adc5145 Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Tue, 6 Sep 2022 14:48:56 +0100 -Subject: [PATCH 5/5] account: Remove redundant box in enterprise login dialog - -The GtkDialog's own content_area vbox is plenty, no need to nest another -one within it. - -Part-of: ---- - .../account/gis-account-page-enterprise.ui | 226 +++++++++--------- - 1 file changed, 110 insertions(+), 116 deletions(-) - -diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -index c53d8a62..d60e69e7 100644 ---- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui -@@ -127,128 +127,122 @@ - - - vertical -- 2 -+ 18 -+ 18 -+ 18 -+ 18 -+ 10 - -- -- vertical -- 18 -- 18 -- 18 -- 18 -- 10 -+ -+ 0.5 -+ 0 -+ True -+ 60 -+ In order to use enterprise logins, this computer needs to be enrolled in a domain. Please have your network administrator type the domain password here, and choose a unique computer name for your computer. -+ -+ -+ -+ -+ 12 -+ True -+ 6 -+ 12 -+ -+ -+ 1 -+ _Domain -+ True -+ join_domain -+ -+ 0 -+ 0 -+ -+ -+ -+ -+ -+ -+ 5 -+ 5 -+ 0 -+ -+ 1 -+ 0 -+ -+ -+ -+ -+ -+ 1 -+ _Computer -+ True -+ join_computer -+ -+ 0 -+ 1 -+ -+ -+ -+ -+ -+ -+ True -+ -+ 1 -+ 1 -+ -+ -+ -+ -+ -+ 1 -+ Administrator _Name -+ True -+ join_name -+ -+ 0 -+ 2 -+ -+ -+ -+ -+ -+ -+ True -+ -+ 1 -+ 2 -+ -+ -+ - -- -- 0.5 -- 0 -- True -- 60 -- In order to use enterprise logins, this computer needs to be enrolled in a domain. Please have your network administrator type the domain password here, and choose a unique computer name for your computer. -+ -+ 1 -+ Administrator Password -+ True -+ join_password -+ -+ 0 -+ 3 -+ -+ - - - -- -- 12 -+ - True -- 6 -- 12 -- -- -- 1 -- _Domain -- True -- join_domain -- -- 0 -- 0 -- -- -- -- -- -- -- 5 -- 5 -- 0 -- -- 1 -- 0 -- -- -- -- -- -- 1 -- _Computer -- True -- join_computer -- -- 0 -- 1 -- -- -- -- -- -- -- True -- -- 1 -- 1 -- -- -- -- -- -- 1 -- Administrator _Name -- True -- join_name -- -- 0 -- 2 -- -- -- -- -- -- -- True -- -- 1 -- 2 -- -- -- -- -- -- 1 -- Administrator Password -- True -- join_password -- -- 0 -- 3 -- -- -- -- -- -- -- True -- -- 1 -- 3 -- -- -- -+ -+ 1 -+ 3 -+ - - - --- -GitLab - diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index f3249e3..bd33de3 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -7,7 +7,7 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-initial-setup -Version: 43~rc +Version: 43~rc.1 Release: %autorelease Summary: Bootstrapping your OS @@ -16,11 +16,6 @@ URL: https://wiki.gnome.org/Design/OS/InitialSetup Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz Source1: vendor.conf -# Backported from upstream -# https://bugzilla.redhat.com/show_bug.cgi?id=2123494 -# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/159 -Patch0: 159.patch - BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: meson diff --git a/sources b/sources index 5fa41d6..2c7536c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-initial-setup-43.rc.tar.xz) = 8b58b0e1e3fe0f951421a5a1c48a1633866eb86d056b0164f8c8bbfa1fae8f167d4150db337a0e0de362e674160ebecc11131d39ac256100663e543e662aa38c +SHA512 (gnome-initial-setup-43.rc.1.tar.xz) = e562d2d667994ce538ba079b671ac49b5e1af69949cc18565d740151746f88d80ea85688f2dc2bcbc79d4606704cb8715219d614542c49560b7f3cd8f12a3998