diff --git a/.gitignore b/.gitignore index 8fb4249..3f758c9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /object-0.22.0.crate /object-0.24.0.crate /object-0.26.2.crate +/object-0.27.1.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..86bc300 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,6 @@ +[DEFAULT] +unwanted-features = + alloc + compiler_builtins + core + rustc-dep-of-std diff --git a/object-fix-metadata.diff b/object-fix-metadata.diff index 592452b..c2b15a2 100644 --- a/object-fix-metadata.diff +++ b/object-fix-metadata.diff @@ -1,48 +1,29 @@ ---- object-0.26.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ object-0.26.2/Cargo.toml 2021-09-21T21:07:44.960855+00:00 -@@ -45,19 +45,6 @@ - [[example]] - name = "readobj" - required-features = ["read"] --[dependencies.alloc] --version = "1.0.0" --optional = true --package = "rustc-std-workspace-alloc" -- --[dependencies.compiler_builtins] --version = "0.1.2" --optional = true -- --[dependencies.core] --version = "1.0.0" --optional = true --package = "rustc-std-workspace-core" - - [dependencies.crc32fast] - version = "1.2" -@@ -75,14 +62,11 @@ +--- object-0.27.1/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ object-0.27.1/Cargo.toml 2022-02-03T15:04:23.969609+00:00 +@@ -51,18 +51,13 @@ version = "2.4.1" default-features = false -[dependencies.wasmparser] -version = "0.57" -optional = true - [dev-dependencies.memmap2] - version = "0.3" - +- [features] -all = ["read", "write", "std", "compression", "wasm"] +all = ["read", "write", "std", "compression"] archive = [] cargo-all = [] coff = [] -@@ -93,9 +77,7 @@ + compression = ["flate2", "std"] + default = ["read", "compression"] +-doc = ["read_core", "write_core", "std", "compression", "archive", "coff", "elf", "macho", "pe", "wasm"] + elf = [] + macho = [] pe = ["coff"] - read = ["read_core", "archive", "coff", "elf", "macho", "pe", "unaligned"] - read_core = [] --rustc-dep-of-std = ["core", "compiler_builtins", "alloc", "memchr/rustc-dep-of-std"] +@@ -71,6 +66,5 @@ + rustc-dep-of-std = ["core", "compiler_builtins", "alloc", "memchr/rustc-dep-of-std"] std = ["memchr/std"] unaligned = [] -wasm = ["wasmparser"] - write = ["write_core", "coff", "elf", "macho"] - write_core = ["crc32fast", "indexmap", "std"] + write = ["write_core", "coff", "elf", "macho", "pe"] + write_core = ["crc32fast", "indexmap/std", "std"] diff --git a/rust-object.spec b/rust-object.spec index a2785a4..4c24fb3 100644 --- a/rust-object.spec +++ b/rust-object.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate object Name: rust-%{crate} -Version: 0.26.2 +Version: 0.27.1 Release: %autorelease Summary: Unified interface for reading and writing object file formats @@ -14,14 +14,10 @@ License: ASL 2.0 or MIT URL: https://crates.io/crates/object Source: %{crates_source} # Initial patched metadata -# * Disable WASM support (wasmparser dependency is very outdated) -# * Drop dependencies on compiler internals +# * disable WASM support (wasmparser dependency is very outdated) Patch0: object-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -36,12 +32,12 @@ 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 CHANGELOG.md +%doc CHANGELOG.md README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -50,8 +46,8 @@ 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 @@ -62,8 +58,8 @@ BuildArch: noarch %description -n %{name}+all-devel %{_description} -This package contains library source intended for building other packages -which use "all" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "all" feature of the "%{crate}" crate. %files -n %{name}+all-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -74,8 +70,8 @@ BuildArch: noarch %description -n %{name}+archive-devel %{_description} -This package contains library source intended for building other packages -which use "archive" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "archive" feature of the "%{crate}" crate. %files -n %{name}+archive-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -86,8 +82,8 @@ BuildArch: noarch %description -n %{name}+cargo-all-devel %{_description} -This package contains library source intended for building other packages -which use "cargo-all" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "cargo-all" feature of the "%{crate}" crate. %files -n %{name}+cargo-all-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -98,8 +94,8 @@ 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. +This package contains library source intended for building other packages which +use the "coff" feature of the "%{crate}" crate. %files -n %{name}+coff-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -110,8 +106,8 @@ BuildArch: noarch %description -n %{name}+compression-devel %{_description} -This package contains library source intended for building other packages -which use "compression" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "compression" feature of the "%{crate}" crate. %files -n %{name}+compression-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -122,8 +118,8 @@ BuildArch: noarch %description -n %{name}+crc32fast-devel %{_description} -This package contains library source intended for building other packages -which use "crc32fast" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "crc32fast" feature of the "%{crate}" crate. %files -n %{name}+crc32fast-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -134,8 +130,8 @@ 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. +This package contains library source intended for building other packages which +use the "elf" feature of the "%{crate}" crate. %files -n %{name}+elf-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -146,8 +142,8 @@ BuildArch: noarch %description -n %{name}+flate2-devel %{_description} -This package contains library source intended for building other packages -which use "flate2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "flate2" feature of the "%{crate}" crate. %files -n %{name}+flate2-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -158,8 +154,8 @@ BuildArch: noarch %description -n %{name}+indexmap-devel %{_description} -This package contains library source intended for building other packages -which use "indexmap" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "indexmap" feature of the "%{crate}" crate. %files -n %{name}+indexmap-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -170,8 +166,8 @@ BuildArch: noarch %description -n %{name}+macho-devel %{_description} -This package contains library source intended for building other packages -which use "macho" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "macho" feature of the "%{crate}" crate. %files -n %{name}+macho-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -182,8 +178,8 @@ 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. +This package contains library source intended for building other packages which +use the "pe" feature of the "%{crate}" crate. %files -n %{name}+pe-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -194,8 +190,8 @@ BuildArch: noarch %description -n %{name}+read-devel %{_description} -This package contains library source intended for building other packages -which use "read" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "read" feature of the "%{crate}" crate. %files -n %{name}+read-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -206,8 +202,8 @@ BuildArch: noarch %description -n %{name}+read_core-devel %{_description} -This package contains library source intended for building other packages -which use "read_core" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "read_core" feature of the "%{crate}" crate. %files -n %{name}+read_core-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -218,8 +214,8 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -230,8 +226,8 @@ BuildArch: noarch %description -n %{name}+unaligned-devel %{_description} -This package contains library source intended for building other packages -which use "unaligned" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "unaligned" feature of the "%{crate}" crate. %files -n %{name}+unaligned-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -242,8 +238,8 @@ BuildArch: noarch %description -n %{name}+write-devel %{_description} -This package contains library source intended for building other packages -which use "write" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "write" feature of the "%{crate}" crate. %files -n %{name}+write-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -254,8 +250,8 @@ 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. +This package contains library source intended for building other packages which +use the "write_core" feature of the "%{crate}" crate. %files -n %{name}+write_core-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sources b/sources index 47550a9..d7f9caf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (object-0.26.2.crate) = 42882e3b1063ad8326bedd3f402831d6206603f8736c5aecc3c16d296007d25360ce9143bb3f859a6d52f1a530809df1f1117d321f0d22f0b43c1831366eec6d +SHA512 (object-0.27.1.crate) = 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589