From ea7fe0a39ae8a50df011c10daf56b84b2496b637 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 30 Aug 2023 15:14:58 +0200 Subject: [PATCH] Update to version 2.6.1; Fixes RHBZ#2235399 --- .gitignore | 1 + memchr-fix-metadata.diff | 10 ---------- rust-memchr.spec | 32 ++++++++++++++++++++++++++------ sources | 2 +- 4 files changed, 28 insertions(+), 17 deletions(-) delete mode 100644 memchr-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 8f27388..343fb53 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /memchr-2.4.0.crate /memchr-2.4.1.crate /memchr-2.5.0.crate +/memchr-2.6.1.crate diff --git a/memchr-fix-metadata.diff b/memchr-fix-metadata.diff deleted file mode 100644 index aa43936..0000000 --- a/memchr-fix-metadata.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- memchr-2.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ memchr-2.5.0/Cargo.toml 2023-08-06T20:21:07.575068+00:00 -@@ -21,6 +21,7 @@ - "/bench", - "/.github", - "/fuzz", -+ "/scripts", - ] - description = "Safe interface to memchr." - homepage = "https://github.com/BurntSushi/memchr" diff --git a/rust-memchr.spec b/rust-memchr.spec index 3bc3ebc..9c9e1f7 100644 --- a/rust-memchr.spec +++ b/rust-memchr.spec @@ -5,19 +5,15 @@ %global crate memchr Name: rust-memchr -Version: 2.5.0 +Version: 2.6.1 Release: %autorelease Summary: Safe interface to memchr -# Upstream license specification: Unlicense/MIT License: Unlicense OR MIT URL: https://crates.io/crates/memchr Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -# * exclude files that are only useful for upstream development -Patch: memchr-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Safe interface to memchr.} @@ -52,6 +48,18 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+alloc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+alloc-devel %{_description} + +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 %{crate_instdir}/Cargo.toml + %package -n %{name}+libc-devel Summary: %{summary} BuildArch: noarch @@ -64,6 +72,18 @@ use the "libc" feature of the "%{crate}" crate. %files -n %{name}+libc-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+logging-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+logging-devel %{_description} + +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 %{crate_instdir}/Cargo.toml + %package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch diff --git a/sources b/sources index e3a2afa..580a98b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (memchr-2.5.0.crate) = 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa +SHA512 (memchr-2.6.1.crate) = 9b93696eb863264bf112c6e81f77083c2fb831662c94bf6ca7335470204758c6a5e794a3542108b1ee627d4eb8f291083d14e00f6195d58e6ce0c06919ba0f77