diff --git a/README.md b/README.md deleted file mode 100644 index d8cd511..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-hamcrest2 - -The rust-hamcrest2 package diff --git a/hamcrest2-fix-metadata.diff b/hamcrest2-fix-metadata.diff index d02c001..e40c58b 100644 --- a/hamcrest2-fix-metadata.diff +++ b/hamcrest2-fix-metadata.diff @@ -1,11 +1,11 @@ --- hamcrest2-0.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ hamcrest2-0.3.0/Cargo.toml 2021-06-18T04:18:16.513685+00:00 ++++ hamcrest2-0.3.0/Cargo.toml 2023-05-22T11:31:06.434437+00:00 @@ -23,7 +23,7 @@ license = "MIT/Apache-2.0" repository = "https://github.com/Valloric/hamcrest2-rust" [dependencies.num] -version = "0.2" -+version = "0.3.1" ++version = "0.3" [dependencies.regex] version = "1" diff --git a/rust-hamcrest2.spec b/rust-hamcrest2.spec index 910b0a4..8abae0e 100644 --- a/rust-hamcrest2.spec +++ b/rust-hamcrest2.spec @@ -1,31 +1,27 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate hamcrest2 -Name: rust-%{crate} +Name: rust-hamcrest2 Version: 0.3.0 Release: %autorelease Summary: Port of the Hamcrest testing 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/hamcrest2 Source: %{crates_source} -# Bump num to 0.3.1 -Patch0: hamcrest2-fix-metadata.diff +# Manually created patch for downstream crate metadata changes +# * bump num dependency from 0.2 to 0.3 +Patch: hamcrest2-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Port of the Hamcrest testing library. Fork of original hamcrest-rust (which is -unmaintained) with extra matchers, better docs etc.} +A port of the Hamcrest testing library. Fork of original hamcrest-rust +(which is unmaintained) with extra matchers, better docs etc.} %description %{_description} @@ -35,13 +31,15 @@ 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-APACHE LICENSE-MIT -%doc README.md CHANGELOG.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}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +47,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