diff --git a/.gitignore b/.gitignore index eee7834..60f17d9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /starship-0.41.1.crate /starship-0.41.3.crate /starship-0.42.0.crate +/starship-0.47.0.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf index 489a32d..d8c1d7b 100644 --- a/.rust2rpm.conf +++ b/.rust2rpm.conf @@ -1,3 +1,3 @@ [DEFAULT] buildrequires = - git-core \ No newline at end of file + git-core diff --git a/rust-starship.spec b/rust-starship.spec index 72992e6..767ec04 100644 --- a/rust-starship.spec +++ b/rust-starship.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 16 %bcond_without check %global crate starship Name: rust-%{crate} -Version: 0.42.0 -Release: 5%{?dist} +Version: 0.47.0 +Release: 1%{?dist} Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ # Upstream license specification: ISC @@ -14,7 +14,6 @@ URL: https://crates.io/crates/starship Source: %{crates_source} # Initial patched metadata # * No vendored -# * Bump attohttpc to 0.15 (already upstream) Patch0: starship-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -32,16 +31,15 @@ Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌 %if ! %{__cargo_skip_build} %package -n %{crate} Summary: %{summary} -# * (MIT or ASL 2.0) and BSD -# * ASL 2.0 -# * ASL 2.0 or Boost -# * ASL 2.0 or MIT -# * ISC -# * MIT -# * MIT or ASL 2.0 -# * MPLv2.0 -# * Unlicense or MIT -License: ISC and ASL 2.0 and MIT and BSD and MPLv2.0 +# ASL 2.0 +# ASL 2.0 or Boost +# ISC +# MIT +# MIT or ASL 2.0 +# MIT or ASL 2.0 or zlib +# MPLv2.0 +# Unlicense or MIT +License: ISC and ASL 2.0 and MIT and MPLv2.0 %description -n %{crate} %{_description} @@ -113,22 +111,20 @@ which use "http" feature of "%{crate}" crate. %files -n %{name}+http-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+native-tls-devel +%package -n %{name}+notify-rust-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+native-tls-devel %{_description} +%description -n %{name}+notify-rust-devel %{_description} This package contains library source intended for building other packages -which use "native-tls" feature of "%{crate}" crate. +which use "notify-rust" feature of "%{crate}" crate. -%files -n %{name}+native-tls-devel +%files -n %{name}+notify-rust-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 -# https://github.com/starship/starship/issues/755 -sed -i -e '/EXE_PATH/s|/debug/|/release/|' tests/testsuite/common.rs %cargo_prep %generate_buildrequires @@ -149,6 +145,9 @@ echo 'git-core' %endif %changelog +* Sun Dec 27 11:41:59 CET 2020 Igor Raits - 0.47.0-1 +- Update to 0.47.0 (Fixes: RHBZ#1851477) + * Tue Sep 29 2020 Fabio Valentini - 0.42.0-5 - Bump attohttpc to 0.15. diff --git a/sources b/sources index 256007d..74efede 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (starship-0.42.0.crate) = a4e53452062038f5551a356fb981b0ae0214f6cf71abc01084f0c3583d5ec8509e41acb48dee11f5e4a98f8fe95f6ad1d0c4b8a06706ba323aa853461048ae26 +SHA512 (starship-0.47.0.crate) = 2ea9e24aa45f38cae6f7105d10bfe23755ecc729b07d1d850aafee9e130bcab74f83d4705fadb2168ff55e548286f60d817046117d73e8537b47fdb6890dfe18 diff --git a/starship-fix-metadata.diff b/starship-fix-metadata.diff index e368546..490c3fa 100644 --- a/starship-fix-metadata.diff +++ b/starship-fix-metadata.diff @@ -1,19 +1,26 @@ ---- starship-0.41.3/Cargo.toml 2020-05-15T15:10:30+00:00 -+++ starship-0.41.3/Cargo.toml 2020-05-16T17:47:49.948287+00:00 -@@ -35,7 +35,7 @@ path = "src/main.rs" - version = "0.12.1" +--- starship-0.47.0/Cargo.toml 2020-11-15T17:24:54+00:00 ++++ starship-0.47.0/Cargo.toml 2020-12-27T10:41:59.006999+00:00 +@@ -69,10 +69,6 @@ + [dependencies.log] + version = "0.4.11" + features = ["std"] +- +-[dependencies.native-tls] +-version = "0.2" +-optional = true - [dependencies.attohttpc] --version = "0.14.0" -+version = "0.15.0" - features = ["tls", "form"] - optional = true - default-features = false -@@ -140,7 +140,6 @@ version = "3.1.0" + [dependencies.notify-rust] + version = "4.0.0" +@@ -150,12 +146,8 @@ [features] default = ["battery", "http"] http = ["attohttpc"] -tls-vendored = ["native-tls/vendored"] + [target."cfg(not(windows))".dependencies.nix] + version = "0.19.0" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["winuser", "securitybaseapi", "processthreadsapi", "handleapi", "impl-default"] [badges.is-it-maintained-issue-resolution] repository = "starship/starship"