diff --git a/.gitignore b/.gitignore index 9b35b1f..0389f38 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /ena-0.14.0.crate +/ena-0.14.1.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf deleted file mode 100644 index 2717226..0000000 --- a/.rust2rpm.conf +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -unwanted-features = - congruence-closure - dogged - persistent - petgraph diff --git a/ena-fix-metadata.diff b/ena-fix-metadata.diff new file mode 100644 index 0000000..1688880 --- /dev/null +++ b/ena-fix-metadata.diff @@ -0,0 +1,21 @@ +--- ena-0.14.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ena-0.14.1/Cargo.toml 2023-02-27T19:08:31.521127+00:00 +@@ -23,18 +23,5 @@ + license = "MIT OR Apache-2.0" + repository = "https://github.com/rust-lang/ena" + +-[dependencies.dogged] +-version = "0.2.0" +-optional = true +- + [dependencies.log] + version = "0.4" +- +-[dependencies.petgraph] +-version = "0.4.5" +-optional = true +- +-[features] +-bench = [] +-congruence-closure = ["petgraph"] +-persistent = ["dogged"] diff --git a/rust-ena.spec b/rust-ena.spec index 7885deb..fdf7d38 100644 --- a/rust-ena.spec +++ b/rust-ena.spec @@ -1,29 +1,26 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate ena -Name: rust-%{crate} -Version: 0.14.0 +Name: rust-ena +Version: 0.14.1 Release: %autorelease Summary: Union-find, congruence closure, and other unification code -# Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/ena Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * remove unused features with outdated optional dependencies +Patch: ena-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Union-find, congruence closure, and other unification code. Based on code from -rustc.} +Union-find, congruence closure, and other unification code. Based on +code from rustc.} %description %{_description} @@ -33,13 +30,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-APACHE LICENSE-MIT -%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} @@ -47,23 +45,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 - -%package -n %{name}+bench-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+bench-devel %{_description} - -This package contains library source intended for building other packages -which use "bench" feature of "%{crate}" crate. - -%files -n %{name}+bench-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 37c28da..00d0851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ena-0.14.0.crate) = bcf842f8f5da8a7e9b8e51df50bdf3f00234534f1d59d96bb1e45b0ee4fa74847eb8b9b5ca615a66d84d23c629d7386f28294a5c64d22efdf2903bc89faab2d4 +SHA512 (ena-0.14.1.crate) = 2754a103c3d01a1168f3419f0568b072e1d8d900b37e1321894a5a4886082f3d7d65b9770069d5cf477a327c891f802f8a7c52dbd6b904b972092c0ff0eb2f6c