diff --git a/.gitignore b/.gitignore index 6d9e556..033ace7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /below-model-0.4.1.crate /below-model-0.5.0.crate +/below-model-0.6.3.crate diff --git a/below-model-fix-metadata.diff b/below-model-fix-metadata.diff new file mode 100644 index 0000000..84dc3e8 --- /dev/null +++ b/below-model-fix-metadata.diff @@ -0,0 +1,14 @@ +--- below-model-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ below-model-0.6.3/Cargo.toml 2023-01-19T03:22:16.573672+00:00 +@@ -58,11 +58,6 @@ + + [dependencies.regex] + version = "1.5.4" +-features = [ +- "std", +- "unicode-perl", +-] +-default-features = false + + [dependencies.serde] + version = "1.0.136" diff --git a/rust-below-model.spec b/rust-below-model.spec index d4c55d8..b7ddff5 100644 --- a/rust-below-model.spec +++ b/rust-below-model.spec @@ -1,22 +1,25 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate below-model -Name: rust-%{crate} -Version: 0.5.0 +Name: rust-below-model +Version: 0.6.3 Release: %autorelease Summary: Model crate for below -# Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 URL: https://crates.io/crates/below-model Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# - restore use of regex default features (back out https://github.com/facebookincubator/below/pull/8164) +Patch: below-model-fix-metadata.diff -ExclusiveArch: %{rust_arches} +# below-btrfs is not available +ExcludeArch: %{ix86} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Model crate for below.} @@ -33,8 +36,8 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -46,7 +49,7 @@ 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 1ce567b..ad7ea9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (below-model-0.5.0.crate) = 13a34c79d4fe14bf508569a693a84a2e05c416debcff7dded421254bea6e1f0386fba44146bd4c5a1a9576bcbec25bb708c9d16ebfbf439b8e966e0bb00a7768 +SHA512 (below-model-0.6.3.crate) = 6c65279937a569a4ee4b4616de327e3847a3f284c86e583afe526febad68f715e34602cd853a70f9762fc278c310f6bab048c626c2ee6983796eb4923f4edd1a