diff --git a/fedora-zincati-cargo-manifest-overrides.diff b/fedora-zincati-cargo-manifest-overrides.diff index 8add9a4..e69de29 100644 --- a/fedora-zincati-cargo-manifest-overrides.diff +++ b/fedora-zincati-cargo-manifest-overrides.diff @@ -1,26 +0,0 @@ -diff --git zincati-0.0.21/Cargo.toml zincati-0.0.21/Cargo.toml -index f2bb13b..0f9baa4 100644 ---- zincati-0.0.21/Cargo.toml -+++ zincati-0.0.21/Cargo.toml -@@ -93,7 +93,7 @@ version = "2.2" - features = ["serde"] - - [dependencies.prometheus] --version = "0.12" -+version = "0.10" - default-features = false - - [dependencies.rand] -@@ -148,10 +148,10 @@ version = "2.6.0" - version = "0.2" - - [dev-dependencies.mockito] --version = "0.30" -+version = "0.28" - - [dev-dependencies.proptest] --version = "1.0" -+version = "0.10" - - [dev-dependencies.tempfile] - version = "^3.2" diff --git a/rust-zincati.spec b/rust-zincati.spec index 96e3088..ab17d91 100644 --- a/rust-zincati.spec +++ b/rust-zincati.spec @@ -4,7 +4,7 @@ # Whether to use vendor tarball. This should stay off in the steady state # when all versioned crate depedencies are packaged, but can be occasionally # enabled in order to decouple lifecycles. -%global with_bundled 1 +%global with_bundled 0 %global __cargo_skip_build 0 %global crate zincati @@ -22,7 +22,7 @@ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version} %if ! 0%{?with_bundled} # Fedora-specific crates overrides, generated with: # git diff --no-prefix zincati-*/Cargo.toml -Patch0: fedora-zincati-cargo-manifest-overrides.diff +#Patch0: fedora-zincati-cargo-manifest-overrides.diff %endif ExclusiveArch: %{rust_arches} @@ -384,6 +384,7 @@ ln -snf /run/%{crate}/public/metrics.promsock %{buildroot}/run/%{crate}/private/ * Fri May 21 2021 Luca BRUNO - 0.0.21-1 - New upstream version https://github.com/coreos/zincati/releases/tag/v0.0.21 +- Turn off the usage of bundled crates, all in Fedora now * Tue May 04 2021 Luca BRUNO - 0.0.20-1 - New upstream version