diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..38a347e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/backtrace-0.3.69.crate diff --git a/.rust-backtrace.metadata b/.rust-backtrace.metadata index e69de29..5a9a6c6 100644 --- a/.rust-backtrace.metadata +++ b/.rust-backtrace.metadata @@ -0,0 +1 @@ +ff7485b6226bc3f3d52686cfbbe55aed48fa4812 SOURCES/backtrace-0.3.69.crate diff --git a/SOURCES/backtrace-0.3.67.crate b/SOURCES/backtrace-0.3.67.crate deleted file mode 100644 index 3e7155c..0000000 Binary files a/SOURCES/backtrace-0.3.67.crate and /dev/null differ diff --git a/SOURCES/backtrace-fix-metadata-auto.diff b/SOURCES/backtrace-fix-metadata-auto.diff index 31cdcee..bb8a82a 100644 --- a/SOURCES/backtrace-fix-metadata-auto.diff +++ b/SOURCES/backtrace-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- backtrace-0.3.67/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ backtrace-0.3.67/Cargo.toml 2023-03-30T21:35:36.293509+00:00 -@@ -127,18 +127,5 @@ +--- backtrace-0.3.69/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ backtrace-0.3.69/Cargo.toml 2023-11-29T18:35:10.063960+00:00 +@@ -104,16 +104,6 @@ std = [] unix-backtrace = [] verify-winapi = [ @@ -16,6 +16,11 @@ - "winapi/winnt", ] + [target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.addr2line] +@@ -140,6 +130,3 @@ + ] + default-features = false + -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" -optional = true diff --git a/SOURCES/backtrace-fix-metadata.diff b/SOURCES/backtrace-fix-metadata.diff index b633fd9..558ea76 100644 --- a/SOURCES/backtrace-fix-metadata.diff +++ b/SOURCES/backtrace-fix-metadata.diff @@ -1,14 +1,6 @@ ---- backtrace-0.3.67/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ backtrace-0.3.67/Cargo.toml 2023-03-30T21:36:01.225600+00:00 -@@ -25,6 +25,7 @@ - readme = "README.md" - license = "MIT OR Apache-2.0" - repository = "https://github.com/rust-lang/backtrace-rs" -+exclude = ["/ci/"] - - [[example]] - name = "backtrace" -@@ -48,17 +49,7 @@ +--- backtrace-0.3.69/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ backtrace-0.3.69/Cargo.toml 2023-11-29T18:35:41.541100+00:00 +@@ -49,17 +49,7 @@ edition = "2018" [[test]] diff --git a/SOURCES/rust2rpm.toml b/SOURCES/rust2rpm.toml new file mode 100644 index 0000000..64e05a9 --- /dev/null +++ b/SOURCES/rust2rpm.toml @@ -0,0 +1,14 @@ +[package] +summary = "Library to acquire a stack trace (backtrace) at runtime in a Rust program" + +[features] +hide = [ + "coresymbolication", + "dbghelp", + "dladdr", + "kernel32", + "libunwind", + "unix-backtrace", + "verify-winapi", +] + diff --git a/SPECS/rust-backtrace.spec b/SPECS/rust-backtrace.spec index abf94f6..d96d1a4 100644 --- a/SPECS/rust-backtrace.spec +++ b/SPECS/rust-backtrace.spec @@ -2,35 +2,34 @@ ## (rpmautospec version 0.3.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate backtrace Name: rust-backtrace -Version: 0.3.67 +Version: 0.3.69 Release: %autorelease Summary: Library to acquire a stack trace (backtrace) at runtime in a Rust program License: MIT OR Apache-2.0 URL: https://crates.io/crates/backtrace Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: backtrace-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * drop "accuracy" test (requires crates to be built in dylib mode) # * drop "current-exe-mismatch" test (fails on i686 for unknown reasons) -# * exclude files for upstream CI Patch: backtrace-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A library to acquire a stack trace (backtrace) at runtime in a Rust @@ -162,12 +161,12 @@ use the "std" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep # drop "accuracy" test (requires crates to be built in dylib mode) # drop "current-exe-mismatch" test (fails on i686 for unknown reasons) rm -r tests/accuracy/ rm tests/current-exe-mismatch.rs -%cargo_prep %generate_buildrequires %cargo_generate_buildrequires @@ -188,9 +187,15 @@ rm tests/current-exe-mismatch.rs %endif %changelog -* Mon Nov 20 2023 Arkady L. Shane - 0.3.67-2 +* Wed Nov 29 2023 Fabio Valentini - 0.3.69-1 +- Update to version 0.3.69; Fixes RHBZ#2218705 + +* Mon Nov 20 2023 Arkady L. Shane - 0.3.67-3 - Rebuilt for MSVSphere 9.2 +* Fri Jul 21 2023 Fedora Release Engineering - 0.3.67-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 30 2023 Fabio Valentini - 0.3.67-2 - Skip a test that fails on i686 for unknown reasons