From ca2beccb47fa4bf56feeb6b6c39c7a6d9f788a85 Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 28 Jul 2024 01:48:50 +0800 Subject: [PATCH 1/2] fix: switchboard-plug-datetime --- .../switchboard-plug-datetime.spec | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec b/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec index dbd8ae9782..857e5a0600 100644 --- a/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec +++ b/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec @@ -4,7 +4,7 @@ %global plug_type system %global plug_name datetime -%global plug_rdnn io.elementary.switchboard.datetime +%global plug_rdnn io.elementary.settings.datetime Name: switchboard-plug-datetime Summary: Switchboard Date & Time Plug @@ -18,11 +18,11 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson -BuildRequires: vala +#BuildRequires: vala BuildRequires: fdupes -BuildRequires: pkgconfig(granite) -BuildRequires: pkgconfig(libadwaita-1) +#BuildRequires: pkgconfig(granite) +#BuildRequires: pkgconfig(libadwaita-1) BuildRequires: switchboard-devel Requires: switchboard%{?_isa} @@ -44,24 +44,24 @@ Supplements: switchboard%{?_isa} %install %meson_install %fdupes %buildroot%_datadir/locale/ -%find_lang %{plug_name}-plug +%find_lang %{plug_rdnn} -# remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +# remove the specified stock icon from metainfo (invalid in libappstream-glib) +sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %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-3/%{plug_type}/lib%{plug_name}.so -%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml +%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml %changelog From a02c2e7cff83aea655a31f4fd6d4d3cd80ed36d2 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 28 Jul 2024 01:54:00 +0800 Subject: [PATCH 2/2] Update switchboard-plug-datetime.spec Signed-off-by: madomado --- .../switchboard-plug-datetime/switchboard-plug-datetime.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec b/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec index 857e5a0600..9714407838 100644 --- a/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec +++ b/anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec @@ -18,11 +18,8 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson -#BuildRequires: vala BuildRequires: fdupes -#BuildRequires: pkgconfig(granite) -#BuildRequires: pkgconfig(libadwaita-1) BuildRequires: switchboard-devel Requires: switchboard%{?_isa}