From a16d73bf1ce70d31dd63198939661da79cf5bacb Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 7 Jun 2023 21:57:03 +0200 Subject: [PATCH] Regenerate with rust2rpm v24 --- README.md | 3 -- rust-term.spec | 37 ++++++++----------- ...tadata.diff => term-fix-metadata-auto.diff | 6 +-- 3 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 README.md rename term-fix-metadata.diff => term-fix-metadata-auto.diff (80%) diff --git a/README.md b/README.md deleted file mode 100644 index f266461..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-term - -The rust-term package \ No newline at end of file diff --git a/rust-term.spec b/rust-term.spec index f16383d..9b31448 100644 --- a/rust-term.spec +++ b/rust-term.spec @@ -1,31 +1,25 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate term -Name: rust-%{crate} +Name: rust-term Version: 0.7.0 Release: %autorelease Summary: Terminal formatting library # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/term Source: %{crates_source} -# Initial patched metadata -# * drop windows-specific dependencies -Patch0: term-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: term-fix-metadata-auto.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Terminal formatting library.} +A terminal formatting library.} %description %{_description} @@ -35,13 +29,14 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +44,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/term-fix-metadata.diff b/term-fix-metadata-auto.diff similarity index 80% rename from term-fix-metadata.diff rename to term-fix-metadata-auto.diff index 3567722..1fc776b 100644 --- a/term-fix-metadata.diff +++ b/term-fix-metadata-auto.diff @@ -1,12 +1,12 @@ --- term-0.7.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ term-0.7.0/Cargo.toml 2021-08-06T12:38:29.799369+00:00 -@@ -28,12 +28,7 @@ ++++ term-0.7.0/Cargo.toml 2023-06-07T19:55:00.924042+00:00 +@@ -28,12 +28,6 @@ [features] default = [] -[target."cfg(windows)".dependencies.rustversion] -version = "1" - +- -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["consoleapi", "wincon", "handleapi", "fileapi"]