From 4b18b5accae29400c42f8a3128ab726fc537a815 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 7 Jul 2025 22:19:51 -0700 Subject: [PATCH] feat(rnote): use cargo macros (#5565) (#5790) * feat(rnote): use cargo macros * Update rnote.spec * call meson too? * try meson install I guess * Update rnote.spec * call meson twice real * did I cook? * !?? * cleanup(rnote): Remove macro recursion * chore: Add prep macro so Mold linker is still enabled * da funny thank roachy * Update rnote.spec * Update rnote.spec * ? * actually * fix: fix sed command * kill me --------- (cherry picked from commit b83fea0e83770ec254b987ef03632154a8d855f7) Signed-off-by: madomado Signed-off-by: Gilver Co-authored-by: madomado Co-authored-by: Gilver --- anda/langs/rust/rnote/rnote.spec | 38 +++++++++++++++++++------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/anda/langs/rust/rnote/rnote.spec b/anda/langs/rust/rnote/rnote.spec index 0167730e79..4641617a5a 100644 --- a/anda/langs/rust/rnote/rnote.spec +++ b/anda/langs/rust/rnote/rnote.spec @@ -1,15 +1,17 @@ -%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold %global rustflags_debuginfo 1 Name: rnote Version: 0.12.0 -Release: 1%?dist -Summary: Sketch and take handwritten notes. +Release: 2%?dist +Summary: Sketch and take handwritten notes License: GPL-3.0 URL: https://github.com/flxzt/rnote +Packager: madonuko Source0: %{url}/archive/refs/tags/v%version.tar.gz -Requires: gtk4 -BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils mold +Recommends: rnote-cli = %evr +BuildRequires: rust-packaging +BuildRequires: cargo meson cmake libappstream-glib gcc-c++ alsa-lib clang-devel python desktop-file-utils mold +BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(glib-2.0) >= 2.66 BuildRequires: pkgconfig(gtk4) >= 4.7 BuildRequires: pkgconfig(libadwaita-1) >= 1.2 @@ -21,12 +23,22 @@ notes and to annotate documents and pictures. Targeted at students, teachers and those who own a drawing tablet, it provides features like PDF and picture import/export, an infinite canvas and an adaptive UI for big and small screens. +%package cli +Summary: The cli version of rnote (`rnote-cli`) +License: GPL-3.0 + +%description cli +This provides the `rnote-cli` binary. For more information, see the `rnote` package. + + %prep %autosetup -n rnote-%{version} - +%cargo_prep_online %build %meson +%cargo_license_summary_online +%{cargo_license_online} > LICENSE.dependencies %meson_build @@ -36,8 +48,7 @@ import/export, an infinite canvas and an adaptive UI for big and small screens. %files %doc README.md -%license LICENSE -%_bindir/rnote-cli +%license LICENSE LICENSE.dependencies %_bindir/rnote %_datadir/thumbnailers/rnote.thumbnailer %_datadir/applications/com.github.flxzt.rnote.desktop @@ -51,10 +62,7 @@ import/export, an infinite canvas and an adaptive UI for big and small screens. %_datadir/rnote/ %_datadir/fonts/rnote-fonts/ - -%changelog -* Wed Nov 2 2022 windowsboy111 - 0.5.7-1 -- Fix requires - -* Sun Oct 23 2022 windowsboy111 - 0.5.7-1 -- Initial package +%files cli +%doc README.md +%license LICENSE LICENSE.dependencies +%_bindir/rnote-cli