diff --git a/rust-slog.spec b/rust-slog.spec index b745574..555b488 100644 --- a/rust-slog.spec +++ b/rust-slog.spec @@ -1,25 +1,22 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate slog -Name: rust-%{crate} +Name: rust-slog Version: 2.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Structured, extensible, composable logging for Rust -# Upstream license specification: MPL-2.0 OR MIT OR Apache-2.0 -License: MPLv2.0 or MIT or ASL 2.0 +License: MPL-2.0 OR MIT OR Apache-2.0 URL: https://crates.io/crates/slog Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * disable LTO to work around LLVM crashes on ppc64le +Patch: slog-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Structured, extensible, composable logging for Rust.} @@ -32,13 +29,16 @@ 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-MPL2 LICENSE-MIT LICENSE-APACHE -%doc README.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%license %{crate_instdir}/LICENSE-MPL2 +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -46,11 +46,11 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+dynamic-keys-devel Summary: %{summary} @@ -58,11 +58,11 @@ BuildArch: noarch %description -n %{name}+dynamic-keys-devel %{_description} -This package contains library source intended for building other packages -which use "dynamic-keys" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dynamic-keys" feature of the "%{crate}" crate. %files -n %{name}+dynamic-keys-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+erased-serde-devel Summary: %{summary} @@ -70,11 +70,11 @@ BuildArch: noarch %description -n %{name}+erased-serde-devel %{_description} -This package contains library source intended for building other packages -which use "erased-serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "erased-serde" feature of the "%{crate}" crate. %files -n %{name}+erased-serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+max_level_debug-devel Summary: %{summary} @@ -82,11 +82,11 @@ BuildArch: noarch %description -n %{name}+max_level_debug-devel %{_description} -This package contains library source intended for building other packages -which use "max_level_debug" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "max_level_debug" feature of the "%{crate}" crate. %files -n %{name}+max_level_debug-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+max_level_error-devel Summary: %{summary} @@ -94,11 +94,11 @@ BuildArch: noarch %description -n %{name}+max_level_error-devel %{_description} -This package contains library source intended for building other packages -which use "max_level_error" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "max_level_error" feature of the "%{crate}" crate. %files -n %{name}+max_level_error-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+max_level_info-devel Summary: %{summary} @@ -106,11 +106,11 @@ BuildArch: noarch %description -n %{name}+max_level_info-devel %{_description} -This package contains library source intended for building other packages -which use "max_level_info" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "max_level_info" feature of the "%{crate}" crate. %files -n %{name}+max_level_info-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+max_level_off-devel Summary: %{summary} @@ -118,11 +118,11 @@ BuildArch: noarch %description -n %{name}+max_level_off-devel %{_description} -This package contains library source intended for building other packages -which use "max_level_off" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "max_level_off" feature of the "%{crate}" crate. %files -n %{name}+max_level_off-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+max_level_trace-devel Summary: %{summary} @@ -130,11 +130,11 @@ BuildArch: noarch %description -n %{name}+max_level_trace-devel %{_description} -This package contains library source intended for building other packages -which use "max_level_trace" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "max_level_trace" feature of the "%{crate}" crate. %files -n %{name}+max_level_trace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+max_level_warn-devel Summary: %{summary} @@ -142,11 +142,11 @@ BuildArch: noarch %description -n %{name}+max_level_warn-devel %{_description} -This package contains library source intended for building other packages -which use "max_level_warn" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "max_level_warn" feature of the "%{crate}" crate. %files -n %{name}+max_level_warn-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nested-values-devel Summary: %{summary} @@ -154,11 +154,11 @@ BuildArch: noarch %description -n %{name}+nested-values-devel %{_description} -This package contains library source intended for building other packages -which use "nested-values" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "nested-values" feature of the "%{crate}" crate. %files -n %{name}+nested-values-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nothreads-devel Summary: %{summary} @@ -166,11 +166,11 @@ BuildArch: noarch %description -n %{name}+nothreads-devel %{_description} -This package contains library source intended for building other packages -which use "nothreads" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "nothreads" feature of the "%{crate}" crate. %files -n %{name}+nothreads-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+release_max_level_debug-devel Summary: %{summary} @@ -178,11 +178,11 @@ BuildArch: noarch %description -n %{name}+release_max_level_debug-devel %{_description} -This package contains library source intended for building other packages -which use "release_max_level_debug" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "release_max_level_debug" feature of the "%{crate}" crate. %files -n %{name}+release_max_level_debug-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+release_max_level_error-devel Summary: %{summary} @@ -190,11 +190,11 @@ BuildArch: noarch %description -n %{name}+release_max_level_error-devel %{_description} -This package contains library source intended for building other packages -which use "release_max_level_error" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "release_max_level_error" feature of the "%{crate}" crate. %files -n %{name}+release_max_level_error-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+release_max_level_info-devel Summary: %{summary} @@ -202,11 +202,11 @@ BuildArch: noarch %description -n %{name}+release_max_level_info-devel %{_description} -This package contains library source intended for building other packages -which use "release_max_level_info" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "release_max_level_info" feature of the "%{crate}" crate. %files -n %{name}+release_max_level_info-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+release_max_level_off-devel Summary: %{summary} @@ -214,11 +214,11 @@ BuildArch: noarch %description -n %{name}+release_max_level_off-devel %{_description} -This package contains library source intended for building other packages -which use "release_max_level_off" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "release_max_level_off" feature of the "%{crate}" crate. %files -n %{name}+release_max_level_off-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+release_max_level_trace-devel Summary: %{summary} @@ -226,11 +226,11 @@ BuildArch: noarch %description -n %{name}+release_max_level_trace-devel %{_description} -This package contains library source intended for building other packages -which use "release_max_level_trace" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "release_max_level_trace" feature of the "%{crate}" crate. %files -n %{name}+release_max_level_trace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+release_max_level_warn-devel Summary: %{summary} @@ -238,11 +238,11 @@ BuildArch: noarch %description -n %{name}+release_max_level_warn-devel %{_description} -This package contains library source intended for building other packages -which use "release_max_level_warn" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "release_max_level_warn" feature of the "%{crate}" crate. %files -n %{name}+release_max_level_warn-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -250,11 +250,11 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -271,16 +271,13 @@ which use "std" feature of "%{crate}" crate. %if %{with check} %check -%ifnarch aarch64 %cargo_test -%else -# rustdoc fails to compile some doctests on aarch64 -# https://bugzilla.redhat.com/show_bug.cgi?id=1902663 -%cargo_test -- --lib -%endif %endif %changelog +* Thu Dec 15 2022 Fabio Valentini - 2.7.0-7 +- Disable LTO to work around LLVM crashes on ppc64le. + * Sat Jul 23 2022 Fedora Release Engineering - 2.7.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/slog-fix-metadata.diff b/slog-fix-metadata.diff new file mode 100644 index 0000000..e682051 --- /dev/null +++ b/slog-fix-metadata.diff @@ -0,0 +1,20 @@ +--- slog-2.7.0/Cargo.toml 2020-11-30T06:26:08+00:00 ++++ slog-2.7.0/Cargo.toml 2022-12-15T13:05:59.148285+00:00 +@@ -26,17 +26,6 @@ + repository = "https://github.com/slog-rs/slog" + [package.metadata.docs.rs] + features = ["std", "nested-values", "dynamic-keys"] +-[profile.bench] +-opt-level = 3 +-lto = true +-debug = false +-debug-assertions = false +- +-[profile.release] +-opt-level = 3 +-lto = true +-debug = false +-debug-assertions = false + + [[example]] + name = "singlethread"