From 69ed4fae98554e807d8a93346a98da6e28a40b76 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 12 May 2022 15:19:33 +0200
Subject: [PATCH] Update to version 2.5.0; Fixes RHBZ#2080657

---
 .gitignore               |  1 +
 memchr-fix-metadata.diff | 17 +++++++--------
 rust-memchr.spec         | 45 ++++++++++++++++++++--------------------
 sources                  |  2 +-
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 160a5b3..8f27388 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /memchr-2.3.4.crate
 /memchr-2.4.0.crate
 /memchr-2.4.1.crate
+/memchr-2.5.0.crate
diff --git a/memchr-fix-metadata.diff b/memchr-fix-metadata.diff
index c3fde02..454e08b 100644
--- a/memchr-fix-metadata.diff
+++ b/memchr-fix-metadata.diff
@@ -1,11 +1,10 @@
---- memchr-2.4.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ memchr-2.4.1/Cargo.toml	2021-08-21T09:08:55.012961+00:00
-@@ -14,7 +14,7 @@
- name = "memchr"
- version = "2.4.1"
- authors = ["Andrew Gallant <jamslam@gmail.com>", "bluss"]
--exclude = ["/bench", "/.github", "/fuzz"]
-+exclude = ["/bench", "/.github", "/fuzz", "/scripts"]
+--- memchr-2.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ memchr-2.5.0/Cargo.toml	2022-05-12T13:17:45.620674+00:00
+@@ -21,6 +21,7 @@
+     "/bench",
+     "/.github",
+     "/fuzz",
++    "/scripts",
+ ]
  description = "Safe interface to memchr."
  homepage = "https://github.com/BurntSushi/memchr"
- documentation = "https://docs.rs/memchr/"
diff --git a/rust-memchr.spec b/rust-memchr.spec
index 6d8ec9a..0aa8c61 100644
--- a/rust-memchr.spec
+++ b/rust-memchr.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 21
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate memchr
 
 Name:           rust-%{crate}
-Version:        2.4.1
+Version:        2.5.0
 Release:        %autorelease
 Summary:        Safe interface to memchr
 
@@ -18,11 +18,8 @@ Source:         %{crates_source}
 Patch0:         memchr-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Safe interface to memchr.}
@@ -35,13 +32,15 @@ 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 UNLICENSE LICENSE-MIT COPYING
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/COPYING
+%license %{crate_instdir}/LICENSE-MIT
+%license %{crate_instdir}/UNLICENSE
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -49,11 +48,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}+libc-devel
 Summary:        %{summary}
@@ -61,11 +60,11 @@ BuildArch:      noarch
 
 %description -n %{name}+libc-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "libc" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "libc" feature of the "%{crate}" crate.
 
 %files       -n %{name}+libc-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+std-devel
 Summary:        %{summary}
@@ -73,11 +72,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
 
 %package     -n %{name}+use_std-devel
 Summary:        %{summary}
@@ -85,11 +84,11 @@ BuildArch:      noarch
 
 %description -n %{name}+use_std-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "use_std" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "use_std" feature of the "%{crate}" crate.
 
 %files       -n %{name}+use_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 f1deb56..e3a2afa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (memchr-2.4.1.crate) = d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+SHA512 (memchr-2.5.0.crate) = 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa