Merge branch 'f35' of ssh://pkgs.fedoraproject.org/rpms/gnome-initial-setup into f35

This commit is contained in:
Kalev Lember 2021-08-24 22:03:22 +02:00
commit 43e847d43f

View File

@ -8,7 +8,7 @@
Name: gnome-initial-setup
Version: 41~beta
Release: 1%{?dist}.1
Release: 2%{?dist}
Summary: Bootstrapping your OS
License: GPLv2+
@ -43,6 +43,8 @@ BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib_required_version}
BuildRequires: pkgconfig(gdm)
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue_version}
BuildRequires: pkgconfig(malcontent-0)
BuildRequires: pkgconfig(malcontent-ui-0)
BuildRequires: pkgconfig(packagekit-glib2)
BuildRequires: pkgconfig(webkit2gtk-4.0)
BuildRequires: krb5-devel
@ -72,7 +74,7 @@ you through configuring it. It is integrated with gdm.
%autosetup -p1 -n %{name}-%{tarball_version}
%build
%meson -Dparental_controls=disabled -Dvendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf
%meson -Dparental_controls=enabled -Dvendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf
%meson_build
%install
@ -107,6 +109,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_datadir}/gnome-initial-setup/vendor.conf
%changelog
* 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)