diff --git a/.gitignore b/.gitignore index 19b2b96..0847f8d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /stacker-0.1.12.crate /stacker-0.1.13.crate /stacker-0.1.14.crate +/stacker-0.1.15.crate diff --git a/rust-stacker.spec b/rust-stacker.spec index d4ef8e3..3eb3ad4 100644 --- a/rust-stacker.spec +++ b/rust-stacker.spec @@ -1,28 +1,23 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate stacker -Name: rust-%{crate} -Version: 0.1.14 +Name: rust-stacker +Version: 0.1.15 Release: %autorelease Summary: Stack growth library useful when implementing deeply recursive algorithms -# Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/stacker Source: %{crates_source} -# Initial patched metadata -# * drop windows-specific dependencies -Patch0: stacker-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: stacker-fix-metadata-auto.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Stack growth library useful when implementing deeply recursive algorithms that @@ -36,13 +31,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} @@ -50,11 +46,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/sources b/sources index 5971ba4..68ebb7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stacker-0.1.14.crate) = 70364d0fe8e1fe0b0b796b72df0e1280922f808de47ee039dc9112660f7fbc4b784ef96b2f4d8a359fce6026d20d4745b2fd11196e860e0030465d0ed455f024 +SHA512 (stacker-0.1.15.crate) = 536cf41f4dea57541941dc89c61e82af3008d0d847243238d622d2e64bff595ebbe077368de87b3844ed0f06ced6cf5b03100e07534f6f5dde7219994369c988 diff --git a/stacker-fix-metadata-auto.diff b/stacker-fix-metadata-auto.diff new file mode 100644 index 0000000..b02ec24 --- /dev/null +++ b/stacker-fix-metadata-auto.diff @@ -0,0 +1,15 @@ +--- stacker-0.1.15/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ stacker-0.1.15/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -44,12 +44,3 @@ + [build-dependencies.cc] + version = "1.0.2" + +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.6" +-features = [ +- "memoryapi", +- "winbase", +- "fibersapi", +- "processthreadsapi", +- "minwindef", +-] diff --git a/stacker-fix-metadata.diff b/stacker-fix-metadata.diff deleted file mode 100644 index 881d977..0000000 --- a/stacker-fix-metadata.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- stacker-0.1.14/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ stacker-0.1.14/Cargo.toml 2021-05-23T12:25:28.531450+00:00 -@@ -36,6 +36,3 @@ - version = "0.1.7" - [build-dependencies.cc] - version = "1.0.2" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.6" --features = ["memoryapi", "winbase", "fibersapi", "processthreadsapi", "minwindef"]