diff --git a/brotli-fix-metadata.diff b/brotli-fix-metadata.diff index ec283e2..c21f57c 100644 --- a/brotli-fix-metadata.diff +++ b/brotli-fix-metadata.diff @@ -1,5 +1,5 @@ --- brotli-3.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ brotli-3.3.0/Cargo.toml 2019-12-14T19:13:13.405220+00:00 ++++ brotli-3.3.0/Cargo.toml 2020-11-24T14:14:51.446107+00:00 @@ -22,6 +22,13 @@ keywords = ["brotli", "decompression", "lz77", "huffman", "nostd"] license = "BSD-3-Clause/MIT" @@ -14,3 +14,25 @@ [profile.release] lto = true incremental = false +@@ -44,12 +51,8 @@ + version = "~2.3" + default-features = false + +-[dependencies.packed_simd] +-version = "0.3" +-optional = true +- + [dependencies.sha2] +-version = "~0.8" ++version = "0.9" + optional = true + + [features] +@@ -59,7 +62,6 @@ + external-literal-probability = [] + pass-through-ffi-panics = [] + seccomp = ["brotli-decompressor/seccomp"] +-simd = ["packed_simd/into_bits"] + std = ["alloc-stdlib", "brotli-decompressor/std"] + validation = ["sha2"] + vector_scratch_space = [] diff --git a/rust-brotli.spec b/rust-brotli.spec index cb3eb5a..882706d 100644 --- a/rust-brotli.spec +++ b/rust-brotli.spec @@ -14,7 +14,7 @@ Name: rust-%{crate} Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Brotli compressor and decompressor avoiding the rust stdlib # Upstream license specification: BSD-3-Clause/MIT @@ -24,6 +24,8 @@ URL: https://crates.io/crates/brotli Source: %{crates_source} # Initial patched metadata # * Exclude unneeded files, https://github.com/dropbox/rust-brotli/pull/43 +# * Exclude simd feature (broken dependencies) +# * Bump sha2 dependency from 0.8 to 0.9 Patch0: brotli-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -116,18 +118,6 @@ which use "external-literal-probability" feature of "%{crate}" crate. %files -n %{name}+external-literal-probability-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+packed_simd-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+packed_simd-devel %{_description} - -This package contains library source intended for building other packages -which use "packed_simd" feature of "%{crate}" crate. - -%files -n %{name}+packed_simd-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+pass-through-ffi-panics-devel Summary: %{summary} BuildArch: noarch @@ -164,18 +154,6 @@ which use "sha2" feature of "%{crate}" crate. %files -n %{name}+sha2-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+simd-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+simd-devel %{_description} - -This package contains library source intended for building other packages -which use "simd" feature of "%{crate}" crate. - -%files -n %{name}+simd-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch @@ -233,6 +211,9 @@ find -type f -name '*.rs' -executable -exec chmod -x '{}' + %endif %changelog +* Tue Nov 24 2020 Fabio Valentini - 3.3.0-4 +- Fix FTI issues for some features. + * Wed Jul 29 2020 Fedora Release Engineering - 3.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild