- updated to 3.34.1

diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index ad477c1e60b4393fd4ce738e653aa922b87fd3a7..b5b16ce29db59400585ac51a2c5778e4eaa424e8 100644 (file)
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -6,46 +6,45 @@
 Summary:       GNOME Initial Setup utility
 Summary(pl.UTF-8):     GNOME Initial Setup - narzędzie do wstępnej konfiguracji środowiska
 Name:          gnome-initial-setup
-Version:       3.24.2
-Release:       3
+Version:       3.34.1
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-initial-setup/3.24/%{name}-%{version}.tar.xz
-# Source0-md5: 33583c43333b7fa17e27a127353bbd12
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-initial-setup/3.34/%{name}-%{version}.tar.xz
+# Source0-md5: 8b5b235ca9c0e72411dc0261237c9b0d
 Patch0:                %{name}-heimdal.patch
 URL:           https://wiki.gnome.org/Design/OS/InitialSetup
 BuildRequires: NetworkManager-devel >= 1.2
 BuildRequires: NetworkManager-gtk-lib-devel >= 1.0
 %{?with_packagekit:BuildRequires:      PackageKit-devel >= 1.1.4}
 BuildRequires: accountsservice-devel
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake >= 1:1.11
 BuildRequires: cheese-devel >= 3.3.5
 BuildRequires: fontconfig-devel
 BuildRequires: gdm-devel >= 3.8.3
 BuildRequires: geoclue2-devel >= 2.3.1
 BuildRequires: geocode-glib-devel >= 1.0
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.46.0
-BuildRequires: gnome-common
+BuildRequires: glib2-devel >= 1:2.53.0
 BuildRequires: gnome-desktop-devel >= 3.8.0
 BuildRequires: gnome-online-accounts-devel >= 3.0
 BuildRequires: gtk+3-devel >= 3.12.0
 BuildRequires: gtk-webkit4-devel >= 2.6.0
 %{!?with_krb5:BuildRequires:   heimdal-devel}
 BuildRequires: ibus-devel >= 1.4.99
-BuildRequires: intltool >= 0.40
 BuildRequires: iso-codes
 BuildRequires: json-glib-devel
 %{?with_krb5:BuildRequires:    krb5-devel}
 BuildRequires: libgweather-devel >= 3.0
 BuildRequires: libpwquality-devel
 BuildRequires: libsecret-devel
-BuildRequires: libtool >= 2:2
+BuildRequires: meson >= 0.47.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pango-devel >= 1:1.32.5
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.103
 BuildRequires: rest-devel >= 0.7
+BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires:      NetworkManager >= 1.2
@@ -54,7 +53,7 @@ Requires:     NetworkManager-gtk-lib >= 1.0
 Requires:      cheese >= 3.3.5
 Requires:      gdm >= 3.8.3
 Requires:      geoclue2 >= 2.3.1
-Requires:      glib2 >= 1:2.46.0
+Requires:      glib2 >= 1:2.53.0
 Requires:      gnome-desktop >= 3.8.0
 Requires:      gnome-online-accounts >= 3.0
 Requires:      gtk+3 >= 3.12.0
@@ -82,22 +81,16 @@ bezpieczny sposób przygotowania nowego systemu.
 %{!?with_krb5:%patch0 -p1}
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-silent-rules \
-       %{?with_packagekit:--enable-software-sources}
-%{__make}
+%meson build \
+       -Dregion-page=true \
+       %{!?with_packagekit:-Dsoftware-sources=disabled}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -114,7 +107,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/gnome-initial-setup-copy-worker
 %attr(755,root,root) %{_libexecdir}/gnome-welcome-tour
 %{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop
-%{_datadir}/gdm/greeter/applications/setup-shell.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
+%{systemduserunitdir}/gnome-session.target.wants
+%{systemduserunitdir}/gnome-session@gnome-initial-setup.target.wants
+%{systemduserunitdir}/gnome-initial-setup-copy-worker.service
+%{systemduserunitdir}/gnome-initial-setup-first-login.service
+%{systemduserunitdir}/gnome-initial-setup.service
+%{systemduserunitdir}/gnome-welcome-tour.service