From fef71ad2aac98149c20ff7dd25cca4e0e9d697db Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 7 Jan 2022 20:44:09 +0100 Subject: [PATCH] Update to version 0.9.2+zstd.1.5.1; Fixes RHBZ#2035402 --- .gitignore | 1 + rust-zstd.spec | 74 +++++++++++++++++++++++++++--------------- sources | 2 +- zstd-fix-metadata.diff | 23 +++++++------ 4 files changed, 63 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index d28dc0b..c5871a8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zstd-0.6.1+zstd.1.4.9.crate /zstd-0.8.0+zstd.1.4.9.crate /zstd-0.9.0+zstd.1.5.0.crate +/zstd-0.9.2+zstd.1.5.1.crate diff --git a/rust-zstd.spec b/rust-zstd.spec index 44429be..35ee455 100644 --- a/rust-zstd.spec +++ b/rust-zstd.spec @@ -1,13 +1,13 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 # Tests require files not included in crate %bcond_with check %global debug_package %{nil} %global crate zstd -%global upstream_version 0.9.0+zstd.1.5.0 +%global upstream_version 0.9.2+zstd.1.5.1 Name: rust-%{crate} -Version: 0.9.0 +Version: 0.9.2 Release: %autorelease Summary: Binding for the zstd compression library @@ -18,12 +18,10 @@ Source: %{crates_source %{crate} %{upstream_version}} # Initial patched metadata # * Remove zstd version from version field # * Build zstd-sys with bindgen and pkg-config +# * Exclude development-only files Patch0: zstd-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -38,8 +36,8 @@ 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 @@ -52,20 +50,32 @@ 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}+arrays-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+arrays-devel %{_description} + +This package contains library source intended for building other packages which +use the "arrays" feature of the "%{crate}" crate. + +%files -n %{name}+arrays-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+bindgen-devel Summary: %{summary} BuildArch: noarch %description -n %{name}+bindgen-devel %{_description} -This package contains library source intended for building other packages -which use "bindgen" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "bindgen" feature of the "%{crate}" crate. %files -n %{name}+bindgen-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -76,8 +86,8 @@ BuildArch: noarch %description -n %{name}+debug-devel %{_description} -This package contains library source intended for building other packages -which use "debug" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "debug" feature of the "%{crate}" crate. %files -n %{name}+debug-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -88,8 +98,8 @@ BuildArch: noarch %description -n %{name}+experimental-devel %{_description} -This package contains library source intended for building other packages -which use "experimental" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "experimental" feature of the "%{crate}" crate. %files -n %{name}+experimental-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -100,20 +110,32 @@ BuildArch: noarch %description -n %{name}+legacy-devel %{_description} -This package contains library source intended for building other packages -which use "legacy" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "legacy" feature of the "%{crate}" crate. %files -n %{name}+legacy-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+no_asm-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+no_asm-devel %{_description} + +This package contains library source intended for building other packages which +use the "no_asm" feature of the "%{crate}" crate. + +%files -n %{name}+no_asm-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+pkg-config-devel Summary: %{summary} BuildArch: noarch %description -n %{name}+pkg-config-devel %{_description} -This package contains library source intended for building other packages -which use "pkg-config" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "pkg-config" feature of the "%{crate}" crate. %files -n %{name}+pkg-config-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -124,8 +146,8 @@ BuildArch: noarch %description -n %{name}+thin-devel %{_description} -This package contains library source intended for building other packages -which use "thin" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "thin" feature of the "%{crate}" crate. %files -n %{name}+thin-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -136,8 +158,8 @@ BuildArch: noarch %description -n %{name}+wasm-devel %{_description} -This package contains library source intended for building other packages -which use "wasm" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "wasm" feature of the "%{crate}" crate. %files -n %{name}+wasm-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -148,8 +170,8 @@ BuildArch: noarch %description -n %{name}+zstdmt-devel %{_description} -This package contains library source intended for building other packages -which use "zstdmt" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "zstdmt" feature of the "%{crate}" crate. %files -n %{name}+zstdmt-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sources b/sources index 4910790..7e9f2b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zstd-0.9.0+zstd.1.5.0.crate) = 64e80dbbd1ba00de21b9dd5300ec61ae642d0280cec8039a0d465547aa863744218c2d314073d6480051af37d2a24cb0553286154f4363257d991d65a1c73742 +SHA512 (zstd-0.9.2+zstd.1.5.1.crate) = 44bbcf78aa75ba77c797bcff5fe738c97ab444fbecceaf302a2f40ca74761bfa13d2a74bbeffa0d8822688eeabdbfb77cbf835a7b4854aef3b5aedc7f4cea571 diff --git a/zstd-fix-metadata.diff b/zstd-fix-metadata.diff index 9955741..cd47e36 100644 --- a/zstd-fix-metadata.diff +++ b/zstd-fix-metadata.diff @@ -1,20 +1,23 @@ ---- zstd-0.9.0+zstd.1.5.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ zstd-0.9.0+zstd.1.5.0/Cargo.toml 2021-11-14T00:23:18.525234+00:00 -@@ -13,7 +13,7 @@ +--- zstd-0.9.2+zstd.1.5.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zstd-0.9.2+zstd.1.5.1/Cargo.toml 2022-01-07T19:00:51.739051+00:00 +@@ -12,9 +12,9 @@ [package] edition = "2018" name = "zstd" --version = "0.9.0+zstd.1.5.0" -+version = "0.9.0" +-version = "0.9.2+zstd.1.5.1" ++version = "0.9.2" authors = ["Alexandre Bury "] - exclude = ["assets/*.zst"] +-exclude = ["assets/*.zst"] ++exclude = ["/assets/", "/appveyor.yml", "/rustfmt.toml"] description = "Binding for the zstd compression library." + documentation = "https://docs.rs/zstd" + readme = "Readme.md" @@ -44,7 +44,7 @@ - [features] + arrays = ["zstd-safe/arrays"] bindgen = ["zstd-safe/bindgen"] debug = ["zstd-safe/debug"] --default = ["legacy"] -+default = ["legacy", "bindgen", "pkg-config"] +-default = ["legacy", "arrays"] ++default = ["legacy", "arrays", "bindgen", "pkg-config"] experimental = ["zstd-safe/experimental"] legacy = ["zstd-safe/legacy"] - pkg-config = ["zstd-safe/pkg-config"] + no_asm = ["zstd-safe/no_asm"]