From 9adf84b9a2145495ad40fb45753e3d49a8d7b5b6cecd6c4860c15760fde42565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 1 Oct 2024 08:48:15 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main malcontent revision d50e031f06176a6620a36791c27b9bb5 --- malcontent-0.10.4.tar.xz | 3 --- malcontent-0.12.0.tar.xz | 3 +++ malcontent.changes | 50 ++++++++++++++++++++++++++++++++++++++++ malcontent.spec | 44 ++++++++++++++++++----------------- 4 files changed, 76 insertions(+), 24 deletions(-) delete mode 100644 malcontent-0.10.4.tar.xz create mode 100644 malcontent-0.12.0.tar.xz diff --git a/malcontent-0.10.4.tar.xz b/malcontent-0.10.4.tar.xz deleted file mode 100644 index 9192d94..0000000 --- a/malcontent-0.10.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dec50b5892d28e1a26c475cd9eb994fe28adcac5190c504d1f797c8e9ad2f534 -size 268200 diff --git a/malcontent-0.12.0.tar.xz b/malcontent-0.12.0.tar.xz new file mode 100644 index 0000000..24f08b2 --- /dev/null +++ b/malcontent-0.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fe59e081a6cad3a15c1fa839d8c7126e32bb3a17a4b7b48e0b8c253ab6c6d41 +size 275828 diff --git a/malcontent.changes b/malcontent.changes index c07e784..419241d 100644 --- a/malcontent.changes +++ b/malcontent.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Wed May 15 06:05:35 UTC 2024 - ming li + +- Update to 0.12.0: + * Support searching list of apps to restrict + * Keynav focus disappears after GTK4 port + * Confusing sentence in user-controls.ui: above, below? + * mct_app_filter_is_appinfo_allowed fails when desktop entry + is missing Exec key + * “All Ages” option for Application Suitability is misleading + * Updated translations + * Add AppInfo support to malcontent-client check-app-filter + * update ru.po + * data: Update appdata + * build: Hide private structs from generated GIR files + * Various build and dependency cleanups for GTK 4.12 + * malcontent-client: Fix syntax error in appinfo support + +------------------------------------------------------------------- +Fri Mar 22 12:18:09 UTC 2024 - pgajdos@suse.com + +- remove dependency on /usr/bin/python3 using + %python3_fix_shebang macro, [bsc#1212476] + +------------------------------------------------------------------- +Thu Oct 12 10:44:27 UTC 2023 - Bjørn + +- Update to version 0.11.1: + + Bugs fixed: build: Switch to Meson’s gnome.post_install + function + + Updated translations. +- Changes from version 0.11.0: + + libmalcontent-ui, and the malcontent-control application, now + use libappstream rather than appstream-glib. + + libmalcontent-ui, and the malcontent-control application, now + use GTK 4 and libadwaita rather than GTK+ 3. + + As a result of these changes, the pkg-config name has been + bumped to libmalcontent-ui-1, and the gobject-introspection + name to MalcontentUi-1. + + Improve keyboard navigation of the malcontent-control + application. + + Updated translations. +- Drop pkgconfig(gtk+-3.0) BuildRequires, and add + desktop-file-utils, pkgconfig(gtk4) and pkgconfig(libadwaita-1) + following upstream changes. +- Rename libmalcontent-ui-0-0, typelib-1_0-MalcontentUi-0 and + typelib-1_0-MalcontentUi-0 to libmalcontent-ui-1-1, + typelib-1_0-MalcontentUi-1 and typelib-1_0-MalcontentUi-1 + following upstream soname changes. + ------------------------------------------------------------------- Tue May 10 16:20:08 UTC 2022 - Ferdinand Thiessen diff --git a/malcontent.spec b/malcontent.spec index 61280b8..12094ca 100644 --- a/malcontent.spec +++ b/malcontent.spec @@ -1,7 +1,7 @@ # # spec file for package malcontent # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,14 @@ Name: malcontent -Version: 0.10.4 +Version: 0.12.0 Release: 0 Summary: Parental control system License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://gitlab.freedesktop.org/pwithnall/malcontent Source: https://tecnocode.co.uk/downloads/%{name}-%{version}.tar.xz + +BuildRequires: desktop-file-utils BuildRequires: itstool BuildRequires: meson >= 0.50.0 BuildRequires: pam-devel @@ -34,7 +36,8 @@ BuildRequires: pkgconfig(flatpak) BuildRequires: pkgconfig(glib-2.0) >= 2.54.2 BuildRequires: pkgconfig(glib-testing-0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) BuildRequires: pkgconfig(polkit-gobject-1) %description @@ -61,18 +64,18 @@ Libmalcontent implements parental controls support which can be used by applications to filter or limit the access of child accounts to inappropriate content. -%package -n libmalcontent-ui-0-0 +%package -n libmalcontent-ui-1-1 Summary: Malcontent UI library -%description -n libmalcontent-ui-0-0 +%description -n libmalcontent-ui-1-1 Libmalcontent implements parental controls support which can be used by applications to filter or limit the access of child accounts to inappropriate content. -%package -n typelib-1_0-MalcontentUi-0 +%package -n typelib-1_0-MalcontentUi-1 Summary: Introspection bindings for the malcontent UI library -%description -n typelib-1_0-MalcontentUi-0 +%description -n typelib-1_0-MalcontentUi-1 Libmalcontent implements parental controls support which can be used by applications to filter or limit the access of child accounts to inappropriate content. @@ -80,9 +83,9 @@ accounts to inappropriate content. %package devel Summary: Devel package Requires: libmalcontent-0-0 = %{version} -Requires: libmalcontent-ui-0-0 = %{version} +Requires: libmalcontent-ui-1-1 = %{version} Requires: typelib-1_0-Malcontent-0 = %{version} -Requires: typelib-1_0-MalcontentUi-0 = %{version} +Requires: typelib-1_0-MalcontentUi-1 = %{version} %description devel Libmalcontent implements parental controls support which can be @@ -112,11 +115,10 @@ sed -i 's|env python3|python3|' malcontent-client/malcontent-client.py # wheel is not used in openSUSE, so we simply package this file as an example %%doc file mv %{buildroot}%{_datadir}/polkit-1/rules.d/com.endlessm.ParentalControls.rules . %find_lang %{name} +%python3_fix_shebang -%post -n libmalcontent-0-0 -p /sbin/ldconfig -%postun -n libmalcontent-0-0 -p /sbin/ldconfig -%post -n libmalcontent-ui-0-0 -p /sbin/ldconfig -%postun -n libmalcontent-ui-0-0 -p /sbin/ldconfig +%ldconfig_scriptlets -n libmalcontent-0-0 +%ldconfig_scriptlets -n libmalcontent-ui-1-1 %files %license COPYING @@ -140,21 +142,21 @@ mv %{buildroot}%{_datadir}/polkit-1/rules.d/com.endlessm.ParentalControls.rules %files -n typelib-1_0-Malcontent-0 %{_libdir}/girepository-1.0/Malcontent-0.typelib -%files -n libmalcontent-ui-0-0 -%{_libdir}/libmalcontent-ui-0.so.* +%files -n libmalcontent-ui-1-1 +%{_libdir}/libmalcontent-ui-1.so.* -%files -n typelib-1_0-MalcontentUi-0 -%{_libdir}/girepository-1.0/MalcontentUi-0.typelib +%files -n typelib-1_0-MalcontentUi-1 +%{_libdir}/girepository-1.0/MalcontentUi-1.typelib %files devel %{_includedir}/%{name}-0/ -%{_includedir}/%{name}-ui-0/ +%{_includedir}/%{name}-ui-1/ %{_libdir}/libmalcontent-0.so -%{_libdir}/libmalcontent-ui-0.so +%{_libdir}/libmalcontent-ui-1.so %{_libdir}/pkgconfig/malcontent-0.pc -%{_libdir}/pkgconfig/malcontent-ui-0.pc +%{_libdir}/pkgconfig/malcontent-ui-1.pc %{_datadir}/gir-1.0/Malcontent-0.gir -%{_datadir}/gir-1.0/MalcontentUi-0.gir +%{_datadir}/gir-1.0/MalcontentUi-1.gir %files control %{_bindir}/malcontent-control