diff --git a/.gitignore b/.gitignore index 045856c..d4ac757 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /cpp_demangle-0.4.1.crate /cpp_demangle-0.4.2.crate /cpp_demangle-0.4.3.crate +/cpp_demangle-0.4.4.crate diff --git a/cpp_demangle-fix-metadata.diff b/cpp_demangle-fix-metadata.diff index fd00c46..9392e99 100644 --- a/cpp_demangle-fix-metadata.diff +++ b/cpp_demangle-fix-metadata.diff @@ -1,26 +1,37 @@ ---- cpp_demangle-0.4.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ cpp_demangle-0.4.3/Cargo.toml 2023-08-23T09:35:41.147931+00:00 -@@ -38,18 +38,10 @@ - ] - license = "MIT OR Apache-2.0" - repository = "https://github.com/gimli-rs/cpp_demangle" -+autobins = false +--- cpp_demangle-0.4.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ cpp_demangle-0.4.4/Cargo.toml 2024-08-28T21:41:04.687375+00:00 +@@ -50,30 +50,8 @@ + name = "cpp_demangle" + path = "src/lib.rs" - [profile.release] - debug = 2 -- -[[bin]] -name = "afl_runner" -path = "src/bin/afl_runner.rs" -required-features = ["afl"] - +-[[example]] +-name = "cppfilt" +-path = "examples/cppfilt.rs" +- +-[[example]] +-name = "simple" +-path = "examples/simple.rs" +-required-features = ["std"] +- -[dependencies.afl] --version = "0.13.1" +-version = "0.15" -optional = true - +- [dependencies.cfg-if] version = "1.0.0" -@@ -64,7 +56,6 @@ +- +-[dev-dependencies.clap] +-version = "4.0" +-features = ["derive"] + + [dev-dependencies.diff] + version = "0.1.11" +@@ -81,7 +59,6 @@ [features] alloc = [] default = ["std"] diff --git a/rust-cpp_demangle.spec b/rust-cpp_demangle.spec index cd885d3..86bb736 100644 --- a/rust-cpp_demangle.spec +++ b/rust-cpp_demangle.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 26 %bcond_without check %global debug_package %{nil} %global crate cpp_demangle Name: rust-cpp_demangle -Version: 0.4.3 +Version: 0.4.4 Release: %autorelease Summary: Crate for demangling C++ symbols @@ -14,9 +14,10 @@ URL: https://crates.io/crates/cpp_demangle Source: %{crates_source} # Manually created patch for downstream crate metadata changes # * drop unused support for the AFL fuzzer +# * drop examples and example-only dev-dependencies Patch: cpp_demangle-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A crate for demangling C++ symbols.} @@ -101,7 +102,7 @@ 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 %generate_buildrequires diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 1fc3e53..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -summary = Crate for demangling C++ symbols diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..ca107ea --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,7 @@ +[package] +summary = "Crate for demangling C++ symbols" +cargo-toml-patch-comments = [ + "drop unused support for the AFL fuzzer", + "drop examples and example-only dev-dependencies", +] + diff --git a/sources b/sources index 0e68021..5aeb981 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cpp_demangle-0.4.3.crate) = d00dba6d709c09082b41ce74b9a15ab73dcb8680bcbb38c60e9ab494957541515cf1ec6e974d6b0870f6c9ed272135fe6554d14e60999442a6a12d5090d67565 +SHA512 (cpp_demangle-0.4.4.crate) = e51fe860f766e4413d51a8973e169d2d74f0a470b32f5494eb76a04ebe7f10b07dddff8d5251f96da39e897e89d9bfa5edcb392b578ee19ac1c06a748c228b19