From 32f4599aa4fd1b26447d100f1816dafebcd9d7722f41c0d0fac9a5b85c30d91f Mon Sep 17 00:00:00 2001 From: Richard Rahl Date: Thu, 6 Jun 2024 05:50:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/X11:COSMIC:Apps/cosmic-ext-applet-apps-menu?expand=0&rev=2 --- ...t-apps-menu-0.1.6+git20240605.2e220d6.obscpio | 4 ++-- cosmic-ext-applet-apps-menu.spec | 6 +++--- fix-justfile.patch | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 fix-justfile.patch diff --git a/cosmic-ext-applet-apps-menu-0.1.6+git20240605.2e220d6.obscpio b/cosmic-ext-applet-apps-menu-0.1.6+git20240605.2e220d6.obscpio index 39fc875..c8f295a 100644 --- a/cosmic-ext-applet-apps-menu-0.1.6+git20240605.2e220d6.obscpio +++ b/cosmic-ext-applet-apps-menu-0.1.6+git20240605.2e220d6.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0bb811ff9df9267064e1b7115ecdf295c9630fa24eec27b67ca344c9d755526 -size 335883 +oid sha256:35282d7b3e190e990e2629fdbf55df4dcde39a290f79d2a112e5173610e08658 +size 335371 diff --git a/cosmic-ext-applet-apps-menu.spec b/cosmic-ext-applet-apps-menu.spec index abf801b..613a683 100644 --- a/cosmic-ext-applet-apps-menu.spec +++ b/cosmic-ext-applet-apps-menu.spec @@ -26,6 +26,7 @@ URL: https://github.com/leb-kuchen/apps-menu-applet-for-cosmic_tm Source0: %{name}-%{version}.tar.zst Source1: vendor.tar.zst Patch0: fix-binary-name.patch +Patch1: fix-justfile.patch BuildRequires: cargo-packaging BuildRequires: hicolor-icon-theme BuildRequires: just @@ -49,9 +50,7 @@ BuildRequires: pkgconfig(xkbcommon) %{cargo_build} %install -install -Dm0755 target/release/cosmic-applet-apps-menu %{buildroot}%{_bindir}/%{name} -install -Dm0644 data/icons/scalable/apps/%{appname}.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{appname}.svg -install -Dm0644 data/%{appname}.desktop %{buildroot}%{_datadir}/applications/%{appname}.desktop +just rootdir=%{buildroot} prefix=%{_prefix} install %suse_update_desktop_file %{appname} %check @@ -62,5 +61,6 @@ install -Dm0644 data/%{appname}.desktop %{buildroot}%{_datadir}/applications/%{a %doc README.md %{_bindir}/%{name} %{_datadir}/applications/%{appname}.desktop +%{_iconsdir}/hicolor/scalable/apps/%{appname}.svg %changelog diff --git a/fix-justfile.patch b/fix-justfile.patch new file mode 100644 index 0000000..785eee3 --- /dev/null +++ b/fix-justfile.patch @@ -0,0 +1,16 @@ +diff -rub apps-menu-applet-for-cosmic_tm/justfile apps-menu-applet-for-cosmic_tm-patched/justfile +--- apps-menu-applet-for-cosmic_tm/justfile 2024-06-06 06:25:37.534920912 +0200 ++++ apps-menu-applet-for-cosmic_tm-patched/justfile 2024-06-06 06:28:18.428249816 +0200 +@@ -1,5 +1,8 @@ ++rootdir := '' ++prefix := '/usr' ++ + # Installs files into the system + install: +- sudo install -Dm0755 ./target/release/cosmic-applet-apps-menu /usr/bin/apps-menu-applet-for-cosmic_tm +- sudo install -Dm0644 data/dev.dominiccgeh.CosmicAppletAppsMenu.desktop /usr/share/applications/dev.dominiccgeh.CosmicAppletAppsMenu.desktop +- find 'data'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} sudo install -Dm0644 'data'/'icons'/{} /usr/share/icons/hicolor/{} +\ No newline at end of file ++ install -Dm0755 ./target/release/cosmic-applet-apps-menu {{rootdir}}{{prefix}}/bin/cosmic-ext-applet-apps-menu ++ install -Dm0644 data/dev.dominiccgeh.CosmicAppletAppsMenu.desktop {{rootdir}}{{prefix}}/share/applications/dev.dominiccgeh.CosmicAppletAppsMenu.desktop ++ find 'data'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} install -Dm0644 'data'/'icons'/{} {{rootdir}}{{prefix}}/share/icons/hicolor/{}