- updated to 3.36.2

diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index fde42960187c3c23e0aa9c9a2eeea4e25917a2bd..785b95234e64035d1fb1e3bc37bcff21514e0667 100644 (file)
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,30 +1,32 @@
+# TODO malcontent-0 >= 0.6.0
 #
 # 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
+%bcond_without packagekit      # PackageKit support (software sources page)
 #
 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.34.3
-Release:       2
+Version:       3.36.2
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-initial-setup/3.34/%{name}-%{version}.tar.xz
-# Source0-md5: b590b8213de930f975f42106b0559172
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-initial-setup/3.36/%{name}-%{version}.tar.xz
+# Source0-md5: 79583e3bbbfa81717a66bce31c04c26c
 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: 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.53.0
+BuildRequires: glib2-devel >= 1:2.63.1
 BuildRequires: gnome-desktop-devel >= 3.8.0
 BuildRequires: gnome-online-accounts-devel >= 3.0
 BuildRequires: gtk+3-devel >= 3.12.0
@@ -35,8 +37,12 @@ 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: libsecret-devel >= 0.18.8
 BuildRequires: meson >= 0.47.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pango-devel >= 1:1.32.5
@@ -50,10 +56,10 @@ 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.53.0
+Requires:      glib2 >= 1:2.63.1
 Requires:      gnome-desktop >= 3.8.0
 Requires:      gnome-online-accounts >= 3.0
 Requires:      gtk+3 >= 3.12.0
@@ -61,6 +67,10 @@ Requires:    gtk-webkit4 >= 2.6.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
@@ -82,8 +92,7 @@ bezpieczny sposób przygotowania nowego systemu.
 
 %build
 %meson build \
-       -Dregion-page=true \
-       %{!?with_packagekit:-Dsoftware-sources=disabled}
+       %{!?with_malcontent:-Dparental_controls=disabled}
 
 %ninja_build -C build