From 8804afaa84df615d9ad447a87c1df701f4e79c4c Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 3 Jul 2024 00:13:56 +0800 Subject: [PATCH 1/9] fix: switchboard Signed-off-by: madomado --- anda/desktops/elementary/switchboard/switchboard.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index cd3a9bbe41..09089599d1 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -21,6 +21,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(granite) >= 5.4.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) >= 0.83.0 +BuildRequires: pkgconfig(gtk4) BuildRequires: fdupes Requires: %{name}-libs%{?_isa} = %{version}-%{release} From 010210f9a53a44727049c58a80b695ee446e4146 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 12:33:14 +0800 Subject: [PATCH 2/9] granite-7 Signed-off-by: madomado --- anda/desktops/elementary/switchboard/switchboard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index 09089599d1..7a10c31285 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -18,7 +18,7 @@ BuildRequires: vala BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(granite) >= 5.4.0 +BuildRequires: pkgconfig(granite-7) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) >= 0.83.0 BuildRequires: pkgconfig(gtk4) From eaf9fbffc83e882a150ed1215fd479918208585c Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 12:37:51 +0800 Subject: [PATCH 3/9] libadwaita-1 Signed-off-by: madomado --- anda/desktops/elementary/switchboard/switchboard.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index 7a10c31285..4c5f7c6bf8 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(granite-7) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) >= 0.83.0 BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) BuildRequires: fdupes Requires: %{name}-libs%{?_isa} = %{version}-%{release} From bd578af93e347190d43157c9a8f74d3a95059df5 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 12:46:54 +0800 Subject: [PATCH 4/9] sassc Signed-off-by: madomado --- anda/desktops/elementary/switchboard/switchboard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index 4c5f7c6bf8..de31fef28c 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -23,7 +23,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) >= 0.83.0 BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(libadwaita-1) -BuildRequires: fdupes +BuildRequires: fdupes sassc Requires: %{name}-libs%{?_isa} = %{version}-%{release} From 706758dbe728fd23c1dafa9c6dd49dc5499976b2 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 12:49:55 +0800 Subject: [PATCH 5/9] a Signed-off-by: madomado --- anda/desktops/elementary/switchboard/switchboard.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index de31fef28c..ad22513da4 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -65,7 +65,7 @@ switchboard. %install %meson_install -%find_lang %{appname} +%dnl %find_lang %{appname} # create plug directories mkdir -p %{buildroot}/%{_libdir}/%{name} @@ -84,7 +84,7 @@ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -95,7 +95,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %files libs %doc README.md From f1b4ad858f653c9a82644e62b76b3d407d48be34 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 12:57:48 +0800 Subject: [PATCH 6/9] Update switchboard.spec Signed-off-by: madomado --- .../elementary/switchboard/switchboard.spec | 43 ++----------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index ad22513da4..1653d7c0ea 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -80,43 +80,8 @@ mkdir -p %{buildroot}/%{_libdir}/%{name}/system %check -desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/%{appname}.desktop +%dnl desktop-file-validate \ +%dnl %{buildroot}/%{_datadir}/applications/%{appname}.desktop -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml - - -%files -f %{appname}.lang -%doc README.md -%license COPYING -%{_bindir}/%{appname} - -%{_datadir}/applications/%{appname}.desktop -%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml -%{_datadir}/icons/hicolor/*/apps/%{appname}.svg -%{_datadir}/metainfo/%{appname}.metainfo.xml - -%files libs -%doc README.md -%license COPYING - -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/* - -%{_libdir}/lib%{name}-2.0.so.0 -%{_libdir}/lib%{name}-2.0.so.2.0 - -%files devel -%{_includedir}/%{name}-2.0/ - -%{_libdir}/lib%{name}-2.0.so -%{_libdir}/pkgconfig/%{name}-2.0.pc - -%{_datadir}/vala/vapi/%{name}-2.0.deps -%{_datadir}/vala/vapi/%{name}-2.0.vapi - - -%changelog -* Sat Oct 15 2022 windowsboy111 - 6.0.2-1 -- Repackaged for Terra +%dnl appstream-util validate-relax --nonet \ +%dnl %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml From 334d3283cd53a8ad5158272523b0b3d72f013486 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 13:30:59 +0800 Subject: [PATCH 7/9] files Signed-off-by: madomado --- .../elementary/switchboard/switchboard.spec | 41 ++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index 1653d7c0ea..dad0feff8a 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -1,5 +1,5 @@ %global srcname switchboard -%global appname io.elementary.switchboard +%global appname io.elementary.settings Name: switchboard Summary: Modular Desktop Settings Hub @@ -65,7 +65,7 @@ switchboard. %install %meson_install -%dnl %find_lang %{appname} +%find_lang %{appname} # create plug directories mkdir -p %{buildroot}/%{_libdir}/%{name} @@ -80,8 +80,37 @@ mkdir -p %{buildroot}/%{_libdir}/%{name}/system %check -%dnl desktop-file-validate \ -%dnl %{buildroot}/%{_datadir}/applications/%{appname}.desktop +desktop-file-validate \ + %{buildroot}/%{_datadir}/applications/%{appname}.desktop -%dnl appstream-util validate-relax --nonet \ -%dnl %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml +appstream-util validate-relax --nonet \ + %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + +%files +%doc README.md +%license COPYING +%{_bindir}/%{appname} + +%{_datadir}/applications/%{appname}.desktop +%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml +%{_iconsdir}/hicolor/*/apps/%{appname}.svg +%{_datadir}/metainfo/%{appname}.appdata.xml + +%files libs +%doc README.md +%license COPYING + +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/* + +%{_libdir}/lib%{name}-3.so.0 +%{_libdir}/lib%{name}-3.so.2.0 + +%files devel +%{_includedir}/%{name}-3/ + +%{_libdir}/lib%{name}-3.so +%{_libdir}/pkgconfig/%{name}-3.pc + +%{_datadir}/vala/vapi/%{name}-3.deps +%{_datadir}/vala/vapi/%{name}-3.vapi From 7f80e7d0606968c80d70316669e7fca1e2ae57df Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 13:32:58 +0800 Subject: [PATCH 8/9] -f %{appname}.lang Signed-off-by: madomado --- anda/desktops/elementary/switchboard/switchboard.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index dad0feff8a..abd928bb00 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -86,7 +86,8 @@ desktop-file-validate \ appstream-util validate-relax --nonet \ %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml -%files + +%files -f %{appname}.lang %doc README.md %license COPYING %{_bindir}/%{appname} From b68bda11f7e3d5ff129411d1edc1a2d7bd1c9682 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 Jul 2024 13:33:35 +0800 Subject: [PATCH 9/9] removing some builddeps Signed-off-by: madomado --- anda/desktops/elementary/switchboard/switchboard.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index abd928bb00..41dad281da 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -16,11 +16,7 @@ BuildRequires: libappstream-glib BuildRequires: meson BuildRequires: vala -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(granite-7) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libhandy-1) >= 0.83.0 BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(libadwaita-1) BuildRequires: fdupes sassc