From 7bd369365c3456bb44d0f8ac2ef53e0aefc2be2a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 18 Apr 2023 00:19:52 +0200 Subject: [PATCH] Update to version 1.1.1 --- .gitignore | 1 + normpath-fix-metadata-auto.diff | 18 +++++++++++------- normpath-fix-metadata.diff | 25 +++++++++++++++++++++++++ rust-normpath.spec | 32 ++++++++++++++++++++++++++++++-- rust2rpm.conf | 3 --- sources | 2 +- 6 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 normpath-fix-metadata.diff delete mode 100644 rust2rpm.conf diff --git a/.gitignore b/.gitignore index 5cdb7bf..a2b4210 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /normpath-0.3.2.crate +/normpath-1.1.1.crate diff --git a/normpath-fix-metadata-auto.diff b/normpath-fix-metadata-auto.diff index f8e1970..165b54a 100644 --- a/normpath-fix-metadata-auto.diff +++ b/normpath-fix-metadata-auto.diff @@ -1,9 +1,13 @@ ---- normpath-0.3.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ normpath-0.3.2/Cargo.toml 1970-01-01T00:00:01+00:00 -@@ -41,6 +41,3 @@ - version = "3.1" +--- normpath-1.1.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ normpath-1.1.1/Cargo.toml 2023-04-15T11:24:10.770892+00:00 +@@ -79,10 +79,3 @@ [target."cfg(not(windows))".dev-dependencies.libc] version = "0.2" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["fileapi"] + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = ["Win32_Storage_FileSystem"] +- +-[target."cfg(windows)".dev-dependencies.windows-sys] +-version = "0.48" +-features = ["Win32_Foundation"] diff --git a/normpath-fix-metadata.diff b/normpath-fix-metadata.diff new file mode 100644 index 0000000..668a204 --- /dev/null +++ b/normpath-fix-metadata.diff @@ -0,0 +1,25 @@ +--- normpath-1.1.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ normpath-1.1.1/Cargo.toml 2023-04-15T11:24:30.095960+00:00 +@@ -60,10 +60,6 @@ + version = "1.0" + optional = true + +-[dependencies.uniquote] +-version = "3.2" +-optional = true +- + [dev-dependencies.bincode] + version = "1.3" + +@@ -71,10 +67,7 @@ + version = "3.2" + + [features] +-localization = [ +- "windows-sys/Win32_UI_Shell", +- "windows-sys/Win32_UI_WindowsAndMessaging", +-] ++localization = [] + + [target."cfg(not(windows))".dev-dependencies.libc] + version = "0.2" diff --git a/rust-normpath.spec b/rust-normpath.spec index fe581d6..09906ca 100644 --- a/rust-normpath.spec +++ b/rust-normpath.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 23 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate normpath Name: rust-normpath -Version: 0.3.2 +Version: 1.1.1 Release: %autorelease Summary: More reliable path manipulation @@ -14,6 +14,10 @@ URL: https://crates.io/crates/normpath Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: normpath-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * drop unused, optional uniquote dependency +# * drop Windows-specific features +Patch: normpath-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -51,6 +55,30 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+localization-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+localization-devel %{_description} + +This package contains library source intended for building other packages which +use the "localization" feature of the "%{crate}" crate. + +%files -n %{name}+localization-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+print_bytes-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+print_bytes-devel %{_description} + +This package contains library source intended for building other packages which +use the "print_bytes" feature of the "%{crate}" crate. + +%files -n %{name}+print_bytes-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+serde-devel Summary: %{summary} BuildArch: noarch diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 2aa91e6..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -unwanted-features = - print_bytes diff --git a/sources b/sources index 663ebd2..daf5ac7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (normpath-0.3.2.crate) = 6462d5fa5b1c2062fe91be9d53c6c37a2c6990b9695b2b255b91d81bfcc8bd8b19d55451bd5705869d0f730ed920f5d2db7706588b6ca3847d386e4d69e92111 +SHA512 (normpath-1.1.1.crate) = 05f1f498f571c57c2307d201d5fa15c72fd2f297b7854757107bb27684470d43a4d40137d31c735018dd2ba50c11f23dfd5e989909e809bdedcd7bbf018385ca