From 969cd349c1379b6b93c16210dbcd15b0cc3228c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 5 Jul 2022 15:42:00 +0200 Subject: [PATCH] Refresh packaging (incl. using SDPX license expression) --- rust-term_size.spec | 55 ++++++++++++++++++------------------- term_size-fix-metadata.diff | 2 +- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/rust-term_size.spec b/rust-term_size.spec index 62c77e6..c40142c 100644 --- a/rust-term_size.spec +++ b/rust-term_size.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} @@ -10,19 +10,15 @@ Release: %autorelease Summary: Functions for determining terminal sizes and dimensions # 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_size Source: %{crates_source} # Initial patched metadata -# * No windows -Patch0: term_size-fix-metadata.diff +Patch: term_size-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Functions for determining terminal sizes and dimensions.} @@ -35,13 +31,16 @@ 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 CHANGELOG.md CONTRIBUTORS.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/CONTRIBUTORS.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +48,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 %package -n %{name}+debug-devel Summary: %{summary} @@ -61,11 +60,11 @@ BuildArch: noarch %description -n %{name}+debug-devel %{_description} -This package contains library source intended for building other packages -which use "debug" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "debug" feature of the "%{crate}" crate. %files -n %{name}+debug-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nightly-devel Summary: %{summary} @@ -73,11 +72,11 @@ BuildArch: noarch %description -n %{name}+nightly-devel %{_description} -This package contains library source intended for building other packages -which use "nightly" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "nightly" feature of the "%{crate}" crate. %files -n %{name}+nightly-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+travis-devel Summary: %{summary} @@ -85,11 +84,11 @@ BuildArch: noarch %description -n %{name}+travis-devel %{_description} -This package contains library source intended for building other packages -which use "travis" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "travis" feature of the "%{crate}" crate. %files -n %{name}+travis-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unstable-devel Summary: %{summary} @@ -97,11 +96,11 @@ BuildArch: noarch %description -n %{name}+unstable-devel %{_description} -This package contains library source intended for building other packages -which use "unstable" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "unstable" feature of the "%{crate}" crate. %files -n %{name}+unstable-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_size-fix-metadata.diff b/term_size-fix-metadata.diff index 898e382..f7174d9 100644 --- a/term_size-fix-metadata.diff +++ b/term_size-fix-metadata.diff @@ -1,5 +1,5 @@ --- term_size-0.3.2/Cargo.toml 2020-05-02T02:35:26+00:00 -+++ term_size-0.3.2/Cargo.toml 2020-05-05T01:35:29.061086+00:00 ++++ term_size-0.3.2/Cargo.toml 2022-07-05T13:41:05.452374+00:00 @@ -62,9 +62,6 @@ unstable = [] [target."cfg(not(target_os = \"windows\"))".dependencies.libc]