diff --git a/anda/langs/rust/pop-launcher/0001-Copy-instead-of-symlink.patch b/anda/langs/rust/pop-launcher/0001-Copy-instead-of-symlink.patch index 2b5eb32f0d..ffce12203b 100644 --- a/anda/langs/rust/pop-launcher/0001-Copy-instead-of-symlink.patch +++ b/anda/langs/rust/pop-launcher/0001-Copy-instead-of-symlink.patch @@ -1,25 +1,13 @@ -From 211c16228c2d7ec02eb63a23b3190bc840bb6b35 Mon Sep 17 00:00:00 2001 -From: Cappy Ishihara -Date: Fri, 20 May 2022 02:59:50 +0700 -Subject: [PATCH] Copy instead of symlink - ---- - justfile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/justfile b/justfile -index 9aab837..826049d 100644 +index 06793e9..5b57310 100644 --- a/justfile +++ b/justfile -@@ -60,7 +60,7 @@ install_plugins: - dest={{plugin_dir}}${plugin} +@@ -70,7 +70,7 @@ install-plugins: + dest={{plugin-dir}}${plugin} mkdir -p ${dest} install -Dm0644 plugins/src/${plugin}/*.ron ${dest} -- ln -sf {{bin_path}} {{plugin_dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') -+ cp -af {{bin_path}} {{plugin_dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') +- ln -srf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') ++ cp -af {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') done # Install pop-launcher scripts --- -2.36.1 - diff --git a/anda/langs/rust/pop-launcher/0001-Remove-frozen-lock.patch b/anda/langs/rust/pop-launcher/0001-Remove-frozen-lock.patch deleted file mode 100644 index e47fe9abe2..0000000000 --- a/anda/langs/rust/pop-launcher/0001-Remove-frozen-lock.patch +++ /dev/null @@ -1,25 +0,0 @@ -From db7faffa6d4da9c53a34180854508ad89acf16de Mon Sep 17 00:00:00 2001 -From: Cappy Ishihara -Date: Fri, 20 May 2022 19:26:32 +0700 -Subject: [PATCH] Remove frozen lock - ---- - justfile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/justfile b/justfile -index 826049d..261fb13 100644 ---- a/justfile -+++ b/justfile -@@ -2,7 +2,7 @@ debug := '0' - vendor := '0' - - target := if debug == '1' { 'debug' } else { 'release' } --vendor_args := if vendor == '1' { '--frozen --offline' } else { '' } -+vendor_args := if vendor == '1' { '--offline' } else { '' } - debug_args := if debug == '1' { '' } else { '--release' } - cargo_args := vendor_args + ' ' + debug_args - --- -2.36.1 - diff --git a/anda/langs/rust/pop-launcher/pop-launcher.spec b/anda/langs/rust/pop-launcher/pop-launcher.spec index 0fef051acf..50732fbd68 100644 --- a/anda/langs/rust/pop-launcher/pop-launcher.spec +++ b/anda/langs/rust/pop-launcher/pop-launcher.spec @@ -13,18 +13,21 @@ Summary: Library for writing plugins and frontends for pop-launcher # Upstream license specification: MPL-2.0 License: MPL-2.0 URL: https://github.com/pop-os/launcher/ -Source: https://github.com/pop-os/launcher/archive/refs/tags/%{version}.tar.gz +Source: %{url}/archive/refs/tags/%{version}.tar.gz Patch: 0001-Copy-instead-of-symlink.patch -Patch1: 0001-Remove-frozen-lock.patch -Provides: rust-%{crate} = 1.2.1 +Provides: rust-%{crate} = 1.2.4 ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging >= 21 -BuildRequires: external:crate:just +BuildRequires: just BuildRequires: anda-srpm-macros BuildRequires: fdupes +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: mold + +Requires: (gnome-shell-extension-pop-shell or cosmic-launcher) %global _description %{expand: Library for writing plugins and frontends for pop-launcher.} @@ -37,7 +40,8 @@ Library for writing plugins and frontends for pop-launcher.} %cargo_prep_online %build -just +%set_build_flags +just build-release %install just rootdir=%{buildroot} install