From 0858cfa7894217b088958dbf425358ec41dfb714 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 30 Mar 2023 22:03:55 +0200 Subject: [PATCH] Update to version 0.4.0; Fixes RHBZ#2136539 --- .gitignore | 1 + README.md | 3 -- cpp_demangle-fix-metadata.diff | 23 +++++++------ rust-cpp_demangle.spec | 62 +++++++++++----------------------- sources | 2 +- 5 files changed, 33 insertions(+), 58 deletions(-) delete mode 100644 README.md diff --git a/.gitignore b/.gitignore index 32d1ecd..18e68b6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cpp_demangle-0.3.3.crate /cpp_demangle-0.3.4.crate /cpp_demangle-0.3.5.crate +/cpp_demangle-0.4.0.crate diff --git a/README.md b/README.md deleted file mode 100644 index a8cc656..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-cpp_demangle - -The rust-cpp_demangle package \ No newline at end of file diff --git a/cpp_demangle-fix-metadata.diff b/cpp_demangle-fix-metadata.diff index b455099..c8a421a 100644 --- a/cpp_demangle-fix-metadata.diff +++ b/cpp_demangle-fix-metadata.diff @@ -1,11 +1,11 @@ ---- cpp_demangle-0.3.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ cpp_demangle-0.3.5/Cargo.toml 2021-12-09T12:50:09.434927+00:00 -@@ -22,16 +22,10 @@ - categories = ["development-tools::debugging", "development-tools::ffi"] - license = "Apache-2.0/MIT" +--- cpp_demangle-0.4.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ cpp_demangle-0.4.0/Cargo.toml 2023-03-30T18:36:09.764806+00:00 +@@ -38,18 +38,10 @@ + ] + license = "MIT OR Apache-2.0" repository = "https://github.com/gimli-rs/cpp_demangle" +autobins = false -+ + [profile.release] debug = true - @@ -13,17 +13,18 @@ -name = "afl_runner" -path = "src/bin/afl_runner.rs" -required-features = ["afl"] +- -[dependencies.afl] --version = "0.11.0" +-version = "0.12.0" -optional = true [dependencies.cfg-if] version = "1.0.0" -@@ -45,7 +39,6 @@ +@@ -64,7 +56,6 @@ + [features] alloc = [] - cppfilt = [] default = ["std"] -fuzz = ["afl"] - logging = [] - nightly = [] + logging = ["std"] run_libiberty_tests = [] + std = ["alloc"] diff --git a/rust-cpp_demangle.spec b/rust-cpp_demangle.spec index c9a6789..5069c28 100644 --- a/rust-cpp_demangle.spec +++ b/rust-cpp_demangle.spec @@ -1,28 +1,25 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate cpp_demangle -Name: rust-%{crate} -Version: 0.3.5 +Name: rust-cpp_demangle +Version: 0.4.0 Release: %autorelease Summary: Crate for demangling C++ symbols -# Upstream license specification: Apache-2.0/MIT -License: ASL 2.0 or MIT +License: MIT OR Apache-2.0 URL: https://crates.io/crates/cpp_demangle Source: %{crates_source} -# Initial patched metadata +# Manually created patch for downstream crate metadata changes # * drop unused support for the AFL fuzzer -Patch0: cpp_demangle-fix-metadata.diff +Patch: cpp_demangle-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Crate for demangling C++ symbols.} +A crate for demangling C++ symbols.} %description %{_description} @@ -36,9 +33,12 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md CONTRIBUTING.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/CONTRIBUTING.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,7 +50,7 @@ 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}+alloc-devel Summary: %{summary} @@ -62,19 +62,7 @@ This package contains library source intended for building other packages which use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+cppfilt-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+cppfilt-devel %{_description} - -This package contains library source intended for building other packages which -use the "cppfilt" feature of the "%{crate}" crate. - -%files -n %{name}+cppfilt-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+logging-devel Summary: %{summary} @@ -86,19 +74,7 @@ This package contains library source intended for building other packages which use the "logging" feature of the "%{crate}" crate. %files -n %{name}+logging-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+nightly-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+nightly-devel %{_description} - -This package contains library source intended for building other packages which -use the "nightly" feature of the "%{crate}" crate. - -%files -n %{name}+nightly-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+run_libiberty_tests-devel Summary: %{summary} @@ -110,7 +86,7 @@ This package contains library source intended for building other packages which use the "run_libiberty_tests" feature of the "%{crate}" crate. %files -n %{name}+run_libiberty_tests-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -122,7 +98,7 @@ 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 diff --git a/sources b/sources index b33229e..c37c8e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cpp_demangle-0.3.5.crate) = ef59cba0cb54cd12232fcd96dc5734b5997ad6ecaf4e86d7f6cccf56c4c18a6cffaa1f6eca46a8889f5a0fb3ea1774495364b698cfd27caccf99fbbaa08d3378 +SHA512 (cpp_demangle-0.4.0.crate) = 49d2c8a6f9e32e8cc123dda0921e62c426afcce3d2982f18ac95c478c187bd00ea0c8e10f96101a2a3cd667b7cbea77669ff113ec23e20eb2b7ad2a99e132dc7