From d3b741480c02fa71ef2fbaececf1fa1123f4baae Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 28 Jul 2024 01:36:08 +0800 Subject: [PATCH 1/4] fix: switchboard-plug-useraccounts --- .../switchboard-plug-useraccounts.spec | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec index 3e1dbbc97c..09b309f3d0 100644 --- a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec @@ -4,7 +4,7 @@ %global plug_type system %global plug_name useraccounts -%global plug_rdnn io.elementary.switchboard.useraccounts +%global plug_rdnn io.elementary.settings.useraccounts Name: switchboard-plug-useraccounts Summary: Switchboard User Accounts Plug @@ -18,18 +18,18 @@ Source0: %url/archive/%version/%srcname-%version.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson >= 0.46.1 -BuildRequires: vala +#BuildRequires: vala BuildRequires: fdupes BuildRequires: pkgconfig(accountsservice) -BuildRequires: gobject-introspection-devel -BuildRequires: gnome-desktop3-devel -BuildRequires: pkgconfig(granite) >= 0.5 -BuildRequires: pkgconfig(libhandy-1) >= 0.90.0 -BuildRequires: pkgconfig(polkit-gobject-1) +#BuildRequires: gobject-introspection-devel +#BuildRequires: gnome-desktop3-devel +#BuildRequires: pkgconfig(granite) >= 0.5 +#BuildRequires: pkgconfig(libhandy-1) >= 0.90.0 +#BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(pwquality) -BuildRequires: polkit-devel -BuildRequires: gtk3-devel +#BuildRequires: polkit-devel +#BuildRequires: gtk3-devel BuildRequires: switchboard-devel Requires: switchboard%?_isa @@ -50,21 +50,21 @@ Supplements: switchboard%?_isa %install %meson_install %fdupes %buildroot%_datadir/locale/ -%find_lang %plug_name-plug +%find_lang %plug_rdnn %check appstream-util validate-relax --nonet \ - %buildroot/%_datadir/metainfo/%plug_rdnn.appdata.xml + %buildroot/%_datadir/metainfo/%plug_rdnn.metainfo.xml -%files -f %plug_name-plug.lang +%files -f %plug_rdnn.lang %doc README.md %license COPYING -%_libdir/switchboard/%plug_type/lib%plug_name.so -%_libdir/switchboard/system/pantheon-useraccounts/guest-session-toggle -%_datadir/metainfo/%plug_rdnn.appdata.xml +%_libdir/switchboard-3/%plug_type/lib%plug_name.so +%_libdir/switchboard-3/system/useraccounts/guest-session-toggle +%_datadir/metainfo/%plug_rdnn.metainfo.xml %_datadir/polkit-1/actions/%plug_rdnn.policy From f55b91c5bb18679366627c6a24c08c4d37211b7a Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 01:43:03 +0800 Subject: [PATCH 2/4] gnome-desktop4 Signed-off-by: madomado --- .../switchboard-plug-useraccounts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec index 09b309f3d0..a666fb9820 100644 --- a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec @@ -23,7 +23,7 @@ BuildRequires: fdupes BuildRequires: pkgconfig(accountsservice) #BuildRequires: gobject-introspection-devel -#BuildRequires: gnome-desktop3-devel +BuildRequires: pkgconfig(gnome-desktop4) #BuildRequires: pkgconfig(granite) >= 0.5 #BuildRequires: pkgconfig(libhandy-1) >= 0.90.0 #BuildRequires: pkgconfig(polkit-gobject-1) From b19572095f2d67759b9e171215377ce1d5f2d507 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 01:43:14 +0800 Subject: [PATCH 3/4] gnome-desktop-4 Signed-off-by: madomado --- .../switchboard-plug-useraccounts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec index a666fb9820..7a1ea72979 100644 --- a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec @@ -23,7 +23,7 @@ BuildRequires: fdupes BuildRequires: pkgconfig(accountsservice) #BuildRequires: gobject-introspection-devel -BuildRequires: pkgconfig(gnome-desktop4) +BuildRequires: pkgconfig(gnome-desktop-4) #BuildRequires: pkgconfig(granite) >= 0.5 #BuildRequires: pkgconfig(libhandy-1) >= 0.90.0 #BuildRequires: pkgconfig(polkit-gobject-1) From 8f49b6b284c9b8e80222473c7a16013bb08ef610 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 01:47:03 +0800 Subject: [PATCH 4/4] Update switchboard-plug-useraccounts.spec Signed-off-by: madomado --- .../switchboard-plug-useraccounts.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec index 7a1ea72979..93da4b77c4 100644 --- a/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-useraccounts/switchboard-plug-useraccounts.spec @@ -18,18 +18,11 @@ Source0: %url/archive/%version/%srcname-%version.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson >= 0.46.1 -#BuildRequires: vala BuildRequires: fdupes BuildRequires: pkgconfig(accountsservice) -#BuildRequires: gobject-introspection-devel BuildRequires: pkgconfig(gnome-desktop-4) -#BuildRequires: pkgconfig(granite) >= 0.5 -#BuildRequires: pkgconfig(libhandy-1) >= 0.90.0 -#BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(pwquality) -#BuildRequires: polkit-devel -#BuildRequires: gtk3-devel BuildRequires: switchboard-devel Requires: switchboard%?_isa