X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-initial-setup.spec;h=81343275770b365fff0aaf86ad6786dc2b4c2f52;hb=59703ee;hp=fecf0d790f5b4c3d34e1b0820fcb05acf7414f15;hpb=5cc1bca6e6c7d8a464f8cb38942becd0c179226f;p=packages%2Fgnome-initial-setup.git

diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index fecf0d7..8134327 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,70 +1,82 @@
 #
 # Conditional build:
 %bcond_with	krb5		# MIT Kerberos 5 instead of Heimdal
-%bcond_with	packagekit	# PackageKit support (software sources page)
+%bcond_without	malcontent	# parental control via malcontent
 #
 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
+Version:	3.38.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.38/%{name}-%{version}.tar.xz
+# Source0-md5:	e5c45b203ac075902110b67731c9caa5
 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:	cheese-devel >= 3.28
 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.63.1
 BuildRequires:	gnome-desktop-devel >= 3.8.0
 BuildRequires:	gnome-online-accounts-devel >= 3.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.37.1
 BuildRequires:	gtk+3-devel >= 3.12.0
-BuildRequires:	gtk-webkit4-devel >= 2.6.0
+BuildRequires:	gtk-webkit4-devel >= 2.26.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
+%if %{with malcontent}
+BuildRequires:	libmalcontent-devel >= 0.6.0
+BuildRequires:	libmalcontent-ui-devel >= 0.6.0
+%endif
 BuildRequires:	libpwquality-devel
-BuildRequires:	libsecret-devel
-BuildRequires:	libtool >= 2:2
+BuildRequires:	libsecret-devel >= 0.18.8
+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-units >= 1:242
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	NetworkManager >= 1.2
 Requires:	NetworkManager-gtk-lib >= 1.0
-%{?with_packagekit:Requires:	PackageKit >= 1.1.4}
-Requires:	cheese >= 3.3.5
+Requires:	cheese >= 3.28
 Requires:	gdm >= 3.8.3
 Requires:	geoclue2 >= 2.3.1
-Requires:	glib2 >= 1:2.46.0
+Requires:	glib2 >= 1:2.63.1
 Requires:	gnome-desktop >= 3.8.0
 Requires:	gnome-online-accounts >= 3.0
+%ifarch %{ix86} %{x8664} aarch64
+# where available
+Requires:	gnome-tour >= 3.38
+%endif
+Requires:	gsettings-desktop-schemas >= 3.37.1
 Requires:	gtk+3 >= 3.12.0
-Requires:	gtk-webkit4 >= 2.6.0
+Requires:	gtk-webkit4 >= 2.26.0
 Requires:	ibus >= 1.4.99
 Requires:	iso-codes
 Requires:	libgweather >= 3.0
+Requires:	libsecret >= 0.18.8
+%if %{with malcontent}
+Requires:	malcontent >= 0.6.0
+%endif
 Requires:	pango >= 1:1.32.5
 Requires:	polkit >= 0.103
 Requires:	rest >= 0.7
+Requires:	systemd-units >= 1:242
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -82,22 +94,15 @@ 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 \
+	%{!?with_malcontent:-Dparental_controls=disabled}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -106,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
+%doc NEWS README.md
 /etc/xdg/autostart/gnome-initial-setup-copy-worker.desktop
 /etc/xdg/autostart/gnome-initial-setup-first-login.desktop
 /etc/xdg/autostart/gnome-welcome-tour.desktop
@@ -114,7 +119,11 @@ 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.d
+%{systemduserunitdir}/gnome-initial-setup-copy-worker.service
+%{systemduserunitdir}/gnome-initial-setup-first-login.service
+%{systemduserunitdir}/gnome-welcome-tour.service