diff --git a/gnome-initial-setup-3.38.5.tar.xz b/gnome-initial-setup-3.38.5.tar.xz deleted file mode 100644 index 7bea268bf54fa572854d4cf01b78a221a4e51e2b..0000000000000000000000000000000000000000 Binary files a/gnome-initial-setup-3.38.5.tar.xz and /dev/null differ diff --git a/gnome-initial-setup-42.2.tar.xz b/gnome-initial-setup-42.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..75c551a2a05f74ce33ca8b5167d622df0813eafa Binary files /dev/null and b/gnome-initial-setup-42.2.tar.xz differ diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index c06099c5cf65e877583ccd24e54ac87b2d6c6f53..cf41d9b46af998c61c04c087f7f6e682ddb3f840 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -1,28 +1,39 @@ +%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 geoclue_version 2.3.1 +%global libhandy_version 1.5.90 + Name: gnome-initial-setup -Version: 3.38.5 +Version: 42.2 Release: 1 Summary: A easy way to prepare a new system License: GPLv2+ URL: https://wiki.gnome.org/Design/OS/InitialSetup -Source0: https://download.gnome.org/sources/gnome-initial-setup/3.38/gnome-initial-setup-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz Source1: vendor.conf Patch9000: 0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch +BuildRequires: libsecret-devel gnome-common meson gcc BuildRequires: krb5-devel desktop-file-utils libpwquality-devel -BuildRequires: pkgconfig(libnm) >= 1.2 pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(libnma) >= 1.0 pkgconfig(cheese) +BuildRequires: pkgconfig(libnm) >= %{nm_version} pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(libnma) >= %{nma_version} pkgconfig(cheese) BuildRequires: pkgconfig(accountsservice) pkgconfig(fontconfig) -BuildRequires: pkgconfig(gnome-desktop-3.0) pkgconfig(gweather-3.0) +BuildRequires: pkgconfig(gnome-desktop-4) pkgconfig(gweather4) BuildRequires: pkgconfig(cheese-gtk) >= 3.3.5 pkgconfig(goa-1.0) BuildRequires: pkgconfig(geocode-glib-1.0) pkgconfig(goa-backend-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.11.3 pkgconfig(glib-2.0) >= 2.63.1 -BuildRequires: pkgconfig(gio-2.0) >= 2.63.1 pkgconfig(gio-unix-2.0) >= 2.63.1 +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk_required_version} glib2-devel >= %{glib_required_version} BuildRequires: pkgconfig(gdm) pkgconfig(iso-codes) -BuildRequires: pkgconfig(libgeoclue-2.0) >= 2.3.1 pkgconfig(packagekit-glib2) +BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue_version} pkgconfig(packagekit-glib2) BuildRequires: pkgconfig(webkit2gtk-4.0) ibus-devel rest-devel polkit-devel -BuildRequires: libsecret-devel gnome-common meson gcc +BuildRequires: pkgconfig(libhandy-1) >= %{libhandy_version} + +Requires: gdm polkit-js-engine libgnomekbd +Requires: geoclue2-libs%{?_isa} >= %{geoclue_version} +Requires: glib2%{?_isa} >= %{glib_required_version} +Requires: libhandy%{?_isa} >= %{libhandy_version} -Requires: gdm geoclue2-libs >= 2.3.1 glib2 >= 2.63.1 polkit-js-engine libgnomekbd Requires(pre): shadow-utils Provides: user(%name) @@ -43,32 +54,36 @@ prepare a new system. %meson_install %delete_la -desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop -desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop - install -d %{buildroot}%{_datadir}/gnome-initial-setup cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/ -%find_lang gnome-initial-setup +%check +desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/gnome-initial-setup.desktop + +%find_lang %{name} %pre useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || : -%files -f gnome-initial-setup.lang -%doc README.md COPYING -%{_libexecdir}/gnome-initial-setup* -%{_libexecdir}/gnome-welcome-tour -%{_sysconfdir}/xdg/autostart/*.desktop -%{_datadir}/gdm/greeter/applications/*.desktop +%files -f %{name}.lang +%license COPYING +%doc NEWS README.md +%{_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}/gnome-session/sessions/gnome-initial-setup.session %{_datadir}/gnome-shell/modes/initial-setup.json %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules %{_userunitdir}/* - -%dir %{_datadir}/gnome-initial-setup %{_datadir}/gnome-initial-setup/vendor.conf %changelog +* Mon Jun 13 2022 lin zhang - 42.2-1 +- Update to 42.2 + * Mon Jun 7 2021 weijin deng - 3.38.5-1 - Upgrade to 3.38.5 - Update Version, Release, Source0, BuildRequires, Requires, stage 'build', 'install', 'files' diff --git a/gnome-initial-setup.yaml b/gnome-initial-setup.yaml index 815b78e27a8974b2e002b9a69608ab7902fdc442..05743053cb08c68a8849691a9d5d26dbc285ca6f 100644 --- a/gnome-initial-setup.yaml +++ b/gnome-initial-setup.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: gnome-initial-setup tag_prefix: ^ -seperator: . +separator: .