.gitignore

@@ -1 +1 @@
-SOURCES/gnome-initial-setup-40.4.tar.xz
+SOURCES/gnome-initial-setup-46.alpha.tar.xz

.gnome-initial-setup.metadata

@@ -1 +1 @@
-451a1f715212ed10fab50625c4ac5abc8418bc85 SOURCES/gnome-initial-setup-40.4.tar.xz
+13aab9e21fccb0a12cf03f1937f5c8c4753d689f SOURCES/gnome-initial-setup-46.alpha.tar.xz

SOURCES/vendor.conf

@@ -1,3 +1,5 @@
-[pages]
+[live_user pages]
-skip=timezone
+skip=privacy;timezone;software;goa;network;
-existing_user_only=language;keyboard
+
+[install]
+application=anaconda.desktop

SPECS/gnome-initial-setup.spec

@@ -1,79 +1,107 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.6.5)
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+    release_number = 11;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
 %global nm_version 1.2
 %global nma_version 1.0
 %global glib_required_version 2.63.1
-%global gtk_required_version 3.11.3
+%global gtk_required_version 4.6
 %global geoclue_version 2.3.1
+%global gnome_desktop_version 44.0-7
 
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
+%if 0%{?rhel}
+%bcond_with webkitgtk
+%else
+%bcond_without webkitgtk
+%endif
+
 Name:           gnome-initial-setup
-Version:        40.4
+Version:        46.alpha
-Release:        3%{?dist}
+Release:        %autorelease
 Summary:        Bootstrapping your OS
 
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            https://wiki.gnome.org/Design/OS/InitialSetup
-Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
 Source1:        vendor.conf
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2097848
+# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/200
-Patch0:         timezones.patch
+Patch: live-user-mode.patch
+# Downstream branding
+Patch: 0001-RHEL10-style-illustrations.patch
 
-BuildRequires:  meson
-BuildRequires:  gcc
-BuildRequires:  git
-BuildRequires:  krb5-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libpwquality-devel
+BuildRequires:  gcc
-BuildRequires:  pkgconfig(libnm) >= %{nm_version}
+BuildRequires:  meson
-BuildRequires:  pkgconfig(libnma) >= %{nma_version}
 BuildRequires:  pkgconfig(accountsservice)
-BuildRequires:  pkgconfig(gnome-desktop-3.0)
-BuildRequires:  pkgconfig(gstreamer-1.0)
-BuildRequires:  pkgconfig(cheese)
-BuildRequires:  pkgconfig(cheese-gtk) >= 3.3.5
 BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(geocode-glib-1.0)
+BuildRequires:  pkgconfig(gdm)
-BuildRequires:  pkgconfig(gweather-3.0)
+BuildRequires:  pkgconfig(geocode-glib-2.0)
-BuildRequires:  pkgconfig(goa-1.0)
-BuildRequires:  pkgconfig(goa-backend-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0) >= %{gtk_required_version}
-BuildRequires:  pkgconfig(glib-2.0) >= %{glib_required_version}
 BuildRequires:  pkgconfig(gio-2.0) >= %{glib_required_version}
 BuildRequires:  pkgconfig(gio-unix-2.0) >= %{glib_required_version}
-BuildRequires:  pkgconfig(gdm)
+BuildRequires:  pkgconfig(glib-2.0) >= %{glib_required_version}
+BuildRequires:  pkgconfig(gnome-desktop-4)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gtk4) >= %{gtk_required_version}
+BuildRequires:  pkgconfig(gweather4)
+BuildRequires:  pkgconfig(ibus-1.0)
 BuildRequires:  pkgconfig(iso-codes)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(krb5)
+BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libgeoclue-2.0) >= %{geoclue_version}
+BuildRequires:  pkgconfig(libnma-gtk4) >= %{nma_version}
+BuildRequires:  pkgconfig(libnm) >= %{nm_version}
+BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(packagekit-glib2)
-BuildRequires:  pkgconfig(webkit2gtk-4.0)
+BuildRequires:  pkgconfig(pango)
-BuildRequires:  krb5-devel
+BuildRequires:  pkgconfig(polkit-gobject-1)
-BuildRequires:  ibus-devel
+BuildRequires:  pkgconfig(pwquality)
-BuildRequires:  rest-devel
+BuildRequires:  pkgconfig(rest-1.0)
-BuildRequires:  polkit-devel
+%if %{with webkitgtk}
-BuildRequires:  libsecret-devel
+BuildRequires:  pkgconfig(webkitgtk-6.0)
+%endif
 
 # gnome-initial-setup is being run by gdm
 Requires: gdm
 Requires: geoclue2-libs%{?_isa} >= %{geoclue_version}
 Requires: glib2%{?_isa} >= %{glib_required_version}
+Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version}
 # we install a rules file
 Requires: polkit-js-engine
-Requires: /usr/bin/gkbd-keyboard-display
+Requires: /usr/bin/tecla
 
 Requires(pre): shadow-utils
 
 Provides: user(%name)
 
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
+
 %description
 GNOME Initial Setup is an alternative to firstboot, providing
 a good setup experience to welcome you to your system, and walks
 you through configuring it. It is integrated with gdm.
 
 %prep
-%autosetup -p1 -n %{name}-%{tarball_version} -Sgit
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
-%meson -Dparental_controls=disabled -Dvendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf
+%meson \
+  -Dparental_controls=disabled \
+%if !%{with webkitgtk}
+  -Dwebkitgtk=disabled \
+%endif
+  %{nil}
 %meson_build
 
 %install
@@ -88,48 +116,279 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
 %find_lang %{name}
 
 %pre
+# we do not use sysusers yet because we need /var/lib/gnome-initial-setup
+# to be owned by the gnome-initial-setup user. please do not convert
+# to sysusers without making sure this is handled, maybe by tmpfiles
 useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || :
 
 %files -f %{name}.lang
 %license COPYING
-%doc README.md
+%doc NEWS README.md
+%attr(-, gnome-initial-setup, gnome-initial-setup) %dir %{_localstatedir}/lib/gnome-initial-setup
+%ghost %{_localstatedir}/gnome-initial-setup/state
 %{_libexecdir}/gnome-initial-setup
 %{_libexecdir}/gnome-initial-setup-copy-worker
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
-
 %{_datadir}/applications/gnome-initial-setup.desktop
+%{_datadir}/dconf/profile/gnome-initial-setup
+%dir %{_datadir}/gnome-initial-setup
+%{_datadir}/gnome-initial-setup/initial-setup-dconf-defaults
+%{_datadir}/gnome-initial-setup/vendor.conf
 %{_datadir}/gnome-session/sessions/gnome-initial-setup.session
 %{_datadir}/gnome-shell/modes/initial-setup.json
 %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
+%{_sysusersdir}/gnome-initial-setup.conf
 %{_userunitdir}/*
 
-%dir %{_datadir}/gnome-initial-setup
-%{_datadir}/gnome-initial-setup/vendor.conf
-
 %changelog
-* Tue Jun 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 40.4-3
+## START: Generated by rpmautospec
-- BuildRequires: git
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 46.alpha-11
+- Bump release for October 2024 mass rebuild:
+
+* Tue Aug 20 2024 Tomas Popela <tpopela@redhat.com> - 46.alpha-10
+- Use branded illustrations
+
+* Thu Aug 08 2024 Tomas Pelka <tpelka@redhat.com> - 46.alpha-9
+- Add gating.yaml via API
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.alpha-8
+- Bump release for June 2024 mass rebuild
+
+* Wed Feb 07 2024 Adam Williamson <awilliam@redhat.com> - 46.alpha-7
+- Revert "Use upstream sysusers configuration"
+
+* Mon Jan 22 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 46.alpha-6
+- Update live-user-mode.patch again
+
+* Fri Jan 19 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 46.alpha-5
+- Update live-user-mode patch
+
+* Thu Jan 18 2024 David King <amigadave@amigadave.com> - 46.alpha-4
+- Use upstream sysusers configuration
+
+* Wed Jan 17 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 46.alpha-3
+- ExcludeArch i686
+
+* Wed Jan 17 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 46.alpha-2
+- Fix URL
+
+* Wed Jan 17 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 46.alpha-1
+- Update to 46.alpha
+
+* Tue Sep 19 2023 Ray Strode <rstrode@redhat.com> - 45.0-3
+- Fix failure from bug in back button patch
+
+* Tue Sep 19 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 45.0-2
+- Update to 45.0 and refresh live user mode patchset
+
+* Tue Sep 19 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 45.0-1
+- Update to 45.0
+
+* Mon Sep 11 2023 Ray Strode <rstrode@redhat.com> - 45~beta-13
+- Fix crash in new user mode
+
+* Sat Sep 09 2023 Ray Strode <rstrode@redhat.com> - 45~beta-12
+- Add missing patches
+
+* Sat Sep 09 2023 Ray Strode <rstrode@redhat.com> - 45~beta-11
+- Select US by default on Russian keyboards
+
+* Fri Sep 08 2023 Ray Strode <rstrode@redhat.com> - 45~beta-10
+- drop unused patches
+
+* Fri Sep 08 2023 Ray Strode <rstrode@redhat.com> - 45~beta-9
+- Don't let language page proceed until it has committed its changes
+
+* Thu Sep 07 2023 Ray Strode <rstrode@redhat.com> - 45~beta-8
+- Fix keyboard page next button that can't be buttoned
+
+* Mon Aug 28 2023 Ray Strode <rstrode@redhat.com> - 45~beta-7
+- More keyboard configuration updates
+
+* Sat Aug 26 2023 Ray Strode <rstrode@redhat.com> - 45~beta-6
+- Update to use slightly tweaked default input sources api from gnome-
+  desktop
+
+* Sat Aug 26 2023 Ray Strode <rstrode@redhat.com> - 45~beta-5
+- Clean up gnome-desktop requires
+
+* Sat Aug 26 2023 Ray Strode <rstrode@redhat.com> - 45~beta-4
+- Add keyboard and input method handling fixes
+
+* Mon Aug 21 2023 Ray Strode <rstrode@redhat.com> - 45~beta-3
+- Add liveuser mode and switch vendor.conf to accomodate it
+
+* Mon Aug 07 2023 Kalev Lember <klember@redhat.com> - 45~beta-2
+- Sort files list
+
+* Mon Aug 07 2023 Kalev Lember <klember@redhat.com> - 45~beta-1
+- Update to 45.beta
+- Requiring tecla instead of gkbd-keyboard-display
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 44.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Mar 23 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 44.0-2
+- Add patch to stop calling 'fedora-third-party disable'
 
-* Tue Jun 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 40.4-2
+* Fri Mar 17 2023 David King <amigadave@amigadave.com> - 44.0-1
-- Remove timezone boundaries
+- Update to 44.0
 
-* Mon Aug 16 2021 David King <amigadave@amigadave.com> - 40.4-1
+* Thu Mar 09 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 44~rc-2
-- Update to 40.4 (#1991431)
+- Rebuild for WebKitGTK 2.39.91
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.1-2
+* Sat Mar 04 2023 David King <amigadave@amigadave.com> - 44~rc-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Update to 44.rc
-  Related: rhbz#1991688
+
+* Wed Feb 22 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 44~beta-2
+- Rebuild for WebKitGTK 2.39.90
+
+* Wed Feb 15 2023 David King <amigadave@amigadave.com> - 44~beta-1
+- Update to 44.beta
+
+* Mon Feb 06 2023 David King <amigadave@amigadave.com> - 44~alpha.2-1
+- Update to 44.alpha.2
+
+* Wed Feb 01 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 43.1-6
+- Rebuild for WebKitGTK 2.39.6/2.39.7
+
+* Sat Jan 21 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 43.1-5
+- Build for WebKitGTK 2.39.5
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 43.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Dec 06 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 43.1-3
+- Fix WebKitGTK build dependency
+
+* Mon Dec 05 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 43.1-2
+- Build against webkitgtk-6.0
+
+* Thu Oct 27 2022 David King <amigadave@amigadave.com> - 43.1-1
+- Update to 43.1
+
+* Wed Sep 21 2022 Kalev Lember <klember@redhat.com> - 43.0-3
+- Fix a few more issues with enterprise login
+
+* Fri Sep 16 2022 Kalev Lember <klember@redhat.com> - 43.0-2
+- Fix criticals when setting up enterprise login
+
+* Fri Sep 16 2022 Kalev Lember <klember@redhat.com> - 43.0-1
+- Update to 43.0
+
+* Wed Sep 07 2022 Kalev Lember <klember@redhat.com> - 43~rc.1-1
+- Update to 43.rc.1
+
+* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 43~rc-3
+- Backport an upstream patch to fix the enterprise login dialog
+
+* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 43~rc-2
+- Drop obsolete libhandy dep
+
+* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 43~rc-1
+- Update to 43.rc
+
+* Sat Aug 13 2022 Adam Williamson <awilliam@redhat.com> - 43~beta-2
+- Backport MR#156 to fix page skipping
+
+* Mon Aug 08 2022 Kalev Lember <klember@redhat.com> - 43~beta-1
+- Update to 43.beta
+- Switch to gtk4
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43~alpha.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Milan Crha <mcrha@redhat.com> - 43~alpha.1-1
+- Update to 43.alpha; Switch to WebKitGTK API 4.1 (using libsoup3)
+
+* Wed Jun 29 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 42.2-4
+- Update timezone map
+
+* Tue Jun 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 42.2-3
+- Do not manually specify vendor.conf path
+
+* Fri May 27 2022 David King <amigadave@amigadave.com> - 42.2-1
+- Update to 42.2
+
+* Thu Apr 21 2022 David King <amigadave@amigadave.com> - 42.1.1-1
+- Update to 42.1.1
+
+* Wed Apr 06 2022 David King <amigadave@amigadave.com> - 42.1-1
+- Update to 42.1
+
+* Thu Mar 24 2022 David King <amigadave@amigadave.com> - 42.0.1-1
+- Update to 42.0.1
+
+* Wed Mar 23 2022 Adam Williamson <awilliam@redhat.com> - 42.0-3
+- Backport proposed upstream fix for keyring issue (#2066424)
+
+* Mon Mar 21 2022 Adam Williamson <awilliam@redhat.com> - 42.0-2
+- Revert dark theme support to fix user keyring password (#2066424)
+
+* Fri Mar 18 2022 David King <amigadave@amigadave.com> - 42.0-1
+- Update to 42.0
+
+* Mon Mar 07 2022 David King <amigadave@amigadave.com> - 42~rc-1
+- Update to 42.rc
+
+* Sun Feb 13 2022 David King <amigadave@amigadave.com> - 42~beta-1
+- Update to 42.beta
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42~alpha.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jan 12 2022 David King <amigadave@amigadave.com> - 42~alpha.1-2
+- Rebuild against gnome-desktop4
+
+* Wed Jan 12 2022 David King <amigadave@amigadave.com> - 42~alpha.1-1
+- Update to 42.alpha.1
+
+* Tue Dec 07 2021 Kalev Lember <klember@redhat.com> - 41.2-1
+- Update to 41.2
+
+* Fri Sep 17 2021 Kalev Lember <klember@redhat.com> - 41.0-1
+- Update to 41.0
+
+* Tue Sep 14 2021 Kalev Lember <klember@redhat.com> - 41~rc-3
+- Disable parental controls support as per Workstation WG decision (#2004259)
+
+* Tue Sep 14 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 41~rc-2
+- Fix new Fedora third party software page
+
+* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 41~rc-1
+- Update to 41.rc
+
+* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 41~beta-3
+- Rebuild
+
+* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 41~beta-2
+- Enable parental controls support
+
+* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 41~beta-1.1
+- Fix the polkit rule for Fedora third party setup (#1996901)
+
+* Mon Aug 23 2021 Kalev Lember <klember@redhat.com> - 41~beta-1
+- Update to 41.beta
+
+* Fri Aug 06 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 41~alpha-2
+- Add enterprise login patch, first user should be a local admin
+
+* Tue Aug 03 2021 Kalev Lember <klember@redhat.com> - 41~alpha-1
+- Update to 41.alpha
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 21 2021 Kalev Lember <klember@redhat.com> - 40.2-1
+- Update to 40.2
 
 * Wed May 05 2021 Kalev Lember <klember@redhat.com> - 40.1-1
 - Update to 40.1
 
-* Fri Apr 30 2021 Kalev Lember <klember@redhat.com> - 40.0-3
+* Fri Apr 30 2021 Kalev Lember <klember@redhat.com> - 40.0-2
 - Drop gnome-tour dep here and move it to gnome-shell instead (#1955179)
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
 - Update to 40.0
 
@@ -619,3 +878,5 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 
 * Fri Jun 08 2012 Jasper St. Pierre <jstpierre@mecheye.net> - 0.1
 - Initial packaging.
+
+## END: Generated by rpmautospec