From a1a9bfeed31fa022bc3131973a851a18c11ce7e0 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 21 Mar 2022 13:35:50 +0100
Subject: [PATCH] Update to version 0.2.4; Fixes RHBZ#2066082

---
 .gitignore                |  1 +
 faccess-fix-metadata.diff | 27 +++++++++++++++++++--------
 rust-faccess.spec         | 20 ++++++++------------
 sources                   |  2 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3fdb4c1..6b4c34d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /faccess-0.2.3.crate
+/faccess-0.2.4.crate
diff --git a/faccess-fix-metadata.diff b/faccess-fix-metadata.diff
index 5491c86..ee51e6f 100644
--- a/faccess-fix-metadata.diff
+++ b/faccess-fix-metadata.diff
@@ -1,12 +1,23 @@
---- faccess-0.2.3/Cargo.toml	2020-04-01T18:46:18+00:00
-+++ faccess-0.2.3/Cargo.toml	2021-12-02T14:17:39.662742+00:00
-@@ -27,6 +27,6 @@
+--- faccess-0.2.4/Cargo.toml	1970-01-01T00:00:01+00:00
++++ faccess-0.2.4/Cargo.toml	2022-03-21T12:13:39.852900+00:00
+@@ -34,19 +34,4 @@
  version = "1.2.1"
+ 
  [target."cfg(unix)".dependencies.libc]
- version = "~0.2.68"
+-version = "~0.2.68"
+-
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3.8"
--features = ["accctrl", "aclapi", "handleapi", "impl-default", "minwindef", "processthreadsapi", "securitybaseapi", "winbase", "winerror", "winnt"]
-+#[target."cfg(windows)".dependencies.winapi]
-+#version = "0.3.8"
-+#features = ["accctrl", "aclapi", "handleapi", "impl-default", "minwindef", "processthreadsapi", "securitybaseapi", "winbase", "winerror", "winnt"]
+-features = [
+-    "accctrl",
+-    "aclapi",
+-    "handleapi",
+-    "impl-default",
+-    "minwindef",
+-    "processthreadsapi",
+-    "securitybaseapi",
+-    "winbase",
+-    "winerror",
+-    "winnt",
+-]
++version = "0.2.68"
diff --git a/rust-faccess.spec b/rust-faccess.spec
index e5c31d5..7a80ea4 100644
--- a/rust-faccess.spec
+++ b/rust-faccess.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 21
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate faccess
 
 Name:           rust-%{crate}
-Version:        0.2.3
+Version:        0.2.4
 Release:        %autorelease
 Summary:        Simple file accessibility checks
 
@@ -14,11 +14,12 @@ License:        MIT
 URL:            https://crates.io/crates/faccess
 Source:         %{crates_source}
 # Initial patched metadata
+# * drop Windows-specific dependencies
 Patch0:         faccess-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Simple file accessibility checks.}
@@ -35,9 +36,9 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE.txt
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE.txt
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -49,15 +50,10 @@ This package contains library source intended for building other packages which
 use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%license LICENSE.txt
-%doc README.md
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
-%ifnarch %{ix86} x86_64
-sed -i 's/const i8/const u8/' src/lib.rs
-%endif
 %cargo_prep
 
 %generate_buildrequires
diff --git a/sources b/sources
index cf87b71..ad26ca5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (faccess-0.2.3.crate) = 54118e75b914529d0ea8b3aea229ef2c35ab4a91f6bc18330ad29c4953fdd70eac7753c6c4ee254d5d18c968f273f2c53a680662a7a15dfb78c5816001a80599
+SHA512 (faccess-0.2.4.crate) = 6d3328238dcdad0a310ad33e28ca32e68314c7a1b99b0c88c4bb5b380c5a385ec8deb23bb5e8f6bb2eff957becf0b514c488564eb6bd88d471f6ebd3a1614efd