Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[f40] fix: starship (#1742) #1757

Merged
merged 1 commit into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions anda/langs/rust/starship/rust-starship.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold
# Generated by rust2rpm 26
#bcond_without check
#cond_without check

%global crate starship

Name: rust-starship
Version: 1.20.1
Release: 1%?dist
Release: %autorelease
Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️

License: ISC
Expand All @@ -17,7 +18,7 @@ Patch: starship-fix-metadata-auto.diff
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: anda-srpm-macros
BuildRequires: cmake
BuildRequires: pkgconfig
BuildRequires: mold
BuildRequires: git-core

%global _description %{expand:
Expand All @@ -28,13 +29,13 @@ shell! ☄🌌️.}

%package -n %{crate}
Summary: %{summary}
License: ISC
License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (0BSD OR MIT OR Apache-2.0) AND 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 OR MIT OR Apache-2.0) AND BSD-3-Clause AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND ISC AND MIT AND (MIT AND Apache-2.0) AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unlicense AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT)

%description -n %{crate} %{_description}

%files -n %{crate}
%license LICENSE
#license LICENSE.dependencies
%license LICENSE.dependencies
%doc README.md
%{_bindir}/starship

Expand All @@ -48,6 +49,8 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.

%files devel
%license %{crate_instdir}/LICENSE
%doc %{crate_instdir}/README.md
%{crate_instdir}/

%package -n %{name}+default-devel
Expand Down Expand Up @@ -175,7 +178,9 @@ use the "starship-battery" feature of the "%{crate}" crate.
%cargo_prep_online

%build
%cargo_build
%dnl %cargo_build
%{cargo_license_summary_online}
%{cargo_license_online} > LICENSE.dependencies

%install
%cargo_install
Expand Down
8 changes: 4 additions & 4 deletions anda/langs/rust/starship/starship-fix-metadata-auto.diff
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- starship-1.19.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ starship-1.19.0/Cargo.toml 2024-05-16T10:47:19.540098+00:00
@@ -263,18 +263,3 @@
--- starship-1.20.1/Cargo.toml 1970-01-01T00:00:01+00:00
+++ starship-1.20.1/Cargo.toml 2024-07-28T16:46:48.656009+00:00
@@ -271,18 +271,3 @@
]
default-features = false

-[target."cfg(windows)".dependencies.deelevate]
-version = "0.2.0"
-
-[target."cfg(windows)".dependencies.windows]
-version = "0.56.0"
-version = "0.58.0"
-features = [
- "Win32_Foundation",
- "Win32_UI_Shell",
Expand Down
Loading