From 58b17787a1942ff7bdde5a69cf0418e456c0ea87 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 5 May 2020 14:47:34 -0700 Subject: [PATCH] Update to 0.18.0 --- .gitignore | 1 + object-fix-metadata.diff | 30 ++++++++++----- rust-object.spec | 81 ++++++++++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 89 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 6eba91b..9ad1234 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /object-0.11.0.crate /object-0.12.0.crate /object-0.17.0.crate +/object-0.18.0.crate diff --git a/object-fix-metadata.diff b/object-fix-metadata.diff index 7bb0858..a47caea 100644 --- a/object-fix-metadata.diff +++ b/object-fix-metadata.diff @@ -1,11 +1,23 @@ ---- object-0.17.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ object-0.17.0/Cargo.toml 2020-02-26T23:34:29.607455+00:00 -@@ -35,7 +35,7 @@ - optional = true +--- object-0.18.0/Cargo.toml 2020-03-22T03:27:36+00:00 ++++ object-0.18.0/Cargo.toml 2020-05-05T21:40:47.927578+00:00 +@@ -49,9 +49,6 @@ + [dependencies.target-lexicon] + version = "0.10" - [dependencies.goblin] --version = "0.1" -+version = "0.2" - features = ["endian_fd", "elf32", "elf64", "mach32", "mach64", "pe32", "pe64", "archive"] - default-features = false +-[dependencies.wasmparser] +-version = "0.51.0" +-optional = true + [dev-dependencies.memmap] + version = "0.7" +@@ -62,9 +59,8 @@ + elf = [] + macho = [] + pe = ["coff"] +-read = ["read_core", "coff", "elf", "macho", "pe", "wasm"] ++read = ["read_core", "coff", "elf", "macho", "pe"] + read_core = [] + std = [] +-wasm = ["wasmparser"] + write = ["write_core", "coff", "elf", "macho"] + write_core = ["crc32fast", "indexmap", "std"] diff --git a/rust-object.spec b/rust-object.spec index caf8745..b41c6b7 100644 --- a/rust-object.spec +++ b/rust-object.spec @@ -5,8 +5,8 @@ %global crate object Name: rust-%{crate} -Version: 0.17.0 -Release: 2%{?dist} +Version: 0.18.0 +Release: 1%{?dist} Summary: Unified interface for reading and writing object file formats # Upstream license specification: Apache-2.0/MIT @@ -14,7 +14,7 @@ License: ASL 2.0 or MIT URL: https://crates.io/crates/object Source: %{crates_source} # Initial patched metadata -# * Bump goblin to 0.2 +# * Remove wasm deps Patch0: object-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -56,6 +56,18 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+coff-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+coff-devel %{_description} + +This package contains library source intended for building other packages +which use "coff" feature of "%{crate}" crate. + +%files -n %{name}+coff-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+compression-devel Summary: %{summary} BuildArch: noarch @@ -80,6 +92,18 @@ which use "crc32fast" feature of "%{crate}" crate. %files -n %{name}+crc32fast-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+elf-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+elf-devel %{_description} + +This package contains library source intended for building other packages +which use "elf" feature of "%{crate}" crate. + +%files -n %{name}+elf-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+flate2-devel Summary: %{summary} BuildArch: noarch @@ -104,16 +128,28 @@ which use "indexmap" feature of "%{crate}" crate. %files -n %{name}+indexmap-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+parity-wasm-devel +%package -n %{name}+macho-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+parity-wasm-devel %{_description} +%description -n %{name}+macho-devel %{_description} This package contains library source intended for building other packages -which use "parity-wasm" feature of "%{crate}" crate. +which use "macho" feature of "%{crate}" crate. -%files -n %{name}+parity-wasm-devel +%files -n %{name}+macho-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+pe-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+pe-devel %{_description} + +This package contains library source intended for building other packages +which use "pe" feature of "%{crate}" crate. + +%files -n %{name}+pe-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+read-devel @@ -128,28 +164,28 @@ which use "read" feature of "%{crate}" crate. %files -n %{name}+read-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+std-devel +%package -n %{name}+read_core-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+std-devel %{_description} +%description -n %{name}+read_core-devel %{_description} This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +which use "read_core" feature of "%{crate}" crate. -%files -n %{name}+std-devel +%files -n %{name}+read_core-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+wasm-devel +%package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+wasm-devel %{_description} +%description -n %{name}+std-devel %{_description} This package contains library source intended for building other packages -which use "wasm" feature of "%{crate}" crate. +which use "std" feature of "%{crate}" crate. -%files -n %{name}+wasm-devel +%files -n %{name}+std-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+write-devel @@ -164,6 +200,18 @@ which use "write" feature of "%{crate}" crate. %files -n %{name}+write-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+write_core-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+write_core-devel %{_description} + +This package contains library source intended for building other packages +which use "write_core" feature of "%{crate}" crate. + +%files -n %{name}+write_core-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep @@ -183,6 +231,9 @@ which use "write" feature of "%{crate}" crate. %endif %changelog +* Tue May 05 2020 Josh Stone - 0.18.0-1 +- Update to 0.18.0 + * Wed Feb 26 2020 Josh Stone - 0.17.0-2 - Bump goblin to 0.2 diff --git a/sources b/sources index d422465..8a27283 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (object-0.17.0.crate) = 0dcafc4649a1a44f047a49ce4efd31d7b3093bd84e840f67a671e509a7cdf9c12c5fcf49319ef5d0684bdf5f7ae044fb60a8a5a7d902ed2334bed228a876b5e0 +SHA512 (object-0.18.0.crate) = 88184784a04c5ab5507720dc58007893d4bbaf4b9e9fc42dd17f1c3df64cd6928a94c47d5fa7b3ca1cf29259c8075e07306c59f073c30c0938d9ec099a4400d5