From be5a8d37384410583b24a6ea40a9ed69a94b4f55 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 14 Mar 2025 04:52:23 -0700 Subject: [PATCH] feat(pokeget-rs): pull from crates.io (#3844) (#3899) * feat(pokeget-rs): pull from crates.io * Update rust-pokeget.spec Signed-off-by: madomado * Refactor Pokeget, update licenses * I THOUGHT I added the check bruh * Packager(s) Signed-off-by: Gilver --------- Signed-off-by: madomado Signed-off-by: Gilver Co-authored-by: Gilver (cherry picked from commit bbdb6510c01d81e5d5357463456643cf48180683) Co-authored-by: madomado --- anda/misc/pokeget-rs/anda.hcl | 5 -- anda/misc/pokeget-rs/pokeget-rs.spec | 42 --------------- anda/misc/pokeget/anda.hcl | 5 ++ anda/misc/pokeget/pokeget.spec | 53 +++++++++++++++++++ anda/misc/{pokeget-rs => pokeget}/update.rhai | 0 5 files changed, 58 insertions(+), 47 deletions(-) delete mode 100644 anda/misc/pokeget-rs/anda.hcl delete mode 100644 anda/misc/pokeget-rs/pokeget-rs.spec create mode 100644 anda/misc/pokeget/anda.hcl create mode 100644 anda/misc/pokeget/pokeget.spec rename anda/misc/{pokeget-rs => pokeget}/update.rhai (100%) diff --git a/anda/misc/pokeget-rs/anda.hcl b/anda/misc/pokeget-rs/anda.hcl deleted file mode 100644 index 9a46c244e6..0000000000 --- a/anda/misc/pokeget-rs/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "pokeget-rs.spec" - } -} diff --git a/anda/misc/pokeget-rs/pokeget-rs.spec b/anda/misc/pokeget-rs/pokeget-rs.spec deleted file mode 100644 index 360fe40c79..0000000000 --- a/anda/misc/pokeget-rs/pokeget-rs.spec +++ /dev/null @@ -1,42 +0,0 @@ -%global pname pokesprite -%global pcommit c5aaa610ff2acdf7fd8e2dccd181bca8be9fcb3e -%global shortname pokeget - -Name: %{shortname}-rs -Version: 1.6.4 -Release: 1%?dist -SourceLicense: MIT -License: MIT AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) -Summary: A better Rust version of pokeget. -URL: https://github.com/talwat/%{name} -BuildRequires: anda-srpm-macros -BuildRequires: cargo-rpm-macros -BuildRequires: mold -Provides: pokeget = %{version}-%{release} -Provides: bundled(%{pname}) = %{pcommit} -Packager: Gilver E. - -%description -Successor to pokeget, written in Rust. - -%prep -%git_clone %{url} %{version} -%cargo_prep_online - -%build -%cargo_build - -%install -install -Dpm755 target/rpm/%{shortname} -t %{buildroot}%{_bindir} -ln -sf %{shortname} %{buildroot}%{_bindir}/%{name} -%{cargo_license_online} > LICENSE.dependencies - -%files -%license LICENSE LICENSE.dependencies data/%{pname}/license.md -%doc README.md -%{_bindir}/%{name} -%{_bindir}/%{shortname} - -%changelog -* Sat Mar 01 2025 Gilver E. -- Initial package diff --git a/anda/misc/pokeget/anda.hcl b/anda/misc/pokeget/anda.hcl new file mode 100644 index 0000000000..2d02d88522 --- /dev/null +++ b/anda/misc/pokeget/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "pokeget.spec" + } +} diff --git a/anda/misc/pokeget/pokeget.spec b/anda/misc/pokeget/pokeget.spec new file mode 100644 index 0000000000..e7e0304dcf --- /dev/null +++ b/anda/misc/pokeget/pokeget.spec @@ -0,0 +1,53 @@ +%global pname pokesprite +%global pcommit c5aaa610ff2acdf7fd8e2dccd181bca8be9fcb3e +%global crate pokeget +%bcond check 1 + +Name: %{crate} +Version: 1.6.4 +Release: 3%?dist +SourceLicense: MIT +License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +Summary: A better Rust version of pokeget. +URL: https://crates.io/crates/%{crate} +Source0: %{crates_source} +BuildRequires: anda-srpm-macros +BuildRequires: cargo-rpm-macros +BuildRequires: mold +Provides: bundled(%{pname}) = %{pcommit} +Obsoletes: %{crate}-rs < %{version}-%{release} +Packager: Gilver E. , madonuko + +%description +Successor to pokeget, written in Rust. + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +%cargo_build + +%install +install -Dpm755 target/rpm/%{crate} -t %{buildroot}%{_bindir} +%{cargo_license_online} > LICENSE.dependencies + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license data/%{pname}/license.md +%doc README.md +%doc OTHER_PROJECTS.md +%{_bindir}/%{crate} + +%changelog +* Mon Mar 10 2025 Gilver E. +- Rename package to drop the rs suffix as the original pokeget is fully obsoleted +- Update licenses +* Sat Mar 01 2025 Gilver E. +- Initial package diff --git a/anda/misc/pokeget-rs/update.rhai b/anda/misc/pokeget/update.rhai similarity index 100% rename from anda/misc/pokeget-rs/update.rhai rename to anda/misc/pokeget/update.rhai