From f4dc7aafaae12c29b850528a89de8c7df781b276 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 18 Jan 2022 23:58:26 +0100 Subject: [PATCH 1/7] Update to version 6.0.0; Fixes RHBZ#2029232 --- .gitignore | 1 + os_str_bytes-fix-metadata.diff | 4 ++-- rust-os_str_bytes.spec | 37 ++++++++++------------------------ sources | 2 +- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index bd30550..4c813fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /os_str_bytes-2.4.0.crate /os_str_bytes-5.0.0.crate +/os_str_bytes-6.0.0.crate diff --git a/os_str_bytes-fix-metadata.diff b/os_str_bytes-fix-metadata.diff index 4015927..3ad54a8 100644 --- a/os_str_bytes-fix-metadata.diff +++ b/os_str_bytes-fix-metadata.diff @@ -1,5 +1,5 @@ ---- os_str_bytes-5.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ os_str_bytes-5.0.0/Cargo.toml 2021-11-23T13:51:48.444589+00:00 +--- os_str_bytes-6.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ os_str_bytes-6.0.0/Cargo.toml 2022-01-18T22:01:12.632258+00:00 @@ -30,13 +30,6 @@ version = "2.4" optional = true diff --git a/rust-os_str_bytes.spec b/rust-os_str_bytes.spec index a8389cc..5565fdc 100644 --- a/rust-os_str_bytes.spec +++ b/rust-os_str_bytes.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate os_str_bytes Name: rust-%{crate} -Version: 5.0.0 +Version: 6.0.0 Release: %autorelease Summary: Utilities for converting between byte sequences and platform-native strings @@ -18,9 +18,6 @@ Source: %{crates_source} Patch0: os_str_bytes-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -35,11 +32,11 @@ 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 LICENSE-MIT LICENSE-APACHE COPYRIGHT +%license COPYRIGHT LICENSE-APACHE LICENSE-MIT %doc README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ @@ -49,32 +46,20 @@ 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 -%package -n %{name}+deprecated-byte-patterns-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+deprecated-byte-patterns-devel %{_description} - -This package contains library source intended for building other packages -which use "deprecated-byte-patterns" feature of "%{crate}" crate. - -%files -n %{name}+deprecated-byte-patterns-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - %package -n %{name}+memchr-devel Summary: %{summary} BuildArch: noarch %description -n %{name}+memchr-devel %{_description} -This package contains library source intended for building other packages -which use "memchr" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "memchr" feature of the "%{crate}" crate. %files -n %{name}+memchr-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -85,8 +70,8 @@ BuildArch: noarch %description -n %{name}+raw_os_str-devel %{_description} -This package contains library source intended for building other packages -which use "raw_os_str" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "raw_os_str" feature of the "%{crate}" crate. %files -n %{name}+raw_os_str-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sources b/sources index a7975ec..e9443ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os_str_bytes-5.0.0.crate) = 338b8c811e5c1c609ce2480f93d0370846335244a48e7cb88b7baa08dca765ce276d4abe2d828afd40e4ded87b9b9fc7c3b940749d27743ab1db3ef7f1016046 +SHA512 (os_str_bytes-6.0.0.crate) = d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8 From 58579a98d64cd839e5230e2b87319fa059d0f16e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 23 May 2022 18:49:08 +0200 Subject: [PATCH 3/7] Update to version 6.0.1; Fixes RHBZ#2086215 --- .gitignore | 1 + os_str_bytes-fix-metadata.diff | 7 ++++--- rust-os_str_bytes.spec | 20 +++++++++++--------- sources | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4c813fe..e6f7ca2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /os_str_bytes-2.4.0.crate /os_str_bytes-5.0.0.crate /os_str_bytes-6.0.0.crate +/os_str_bytes-6.0.1.crate diff --git a/os_str_bytes-fix-metadata.diff b/os_str_bytes-fix-metadata.diff index 3ad54a8..001e1f5 100644 --- a/os_str_bytes-fix-metadata.diff +++ b/os_str_bytes-fix-metadata.diff @@ -1,6 +1,6 @@ ---- os_str_bytes-6.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ os_str_bytes-6.0.0/Cargo.toml 2022-01-18T22:01:12.632258+00:00 -@@ -30,13 +30,6 @@ +--- os_str_bytes-6.0.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ os_str_bytes-6.0.1/Cargo.toml 2022-05-23T16:47:56.682610+00:00 +@@ -56,14 +56,6 @@ version = "2.4" optional = true @@ -11,6 +11,7 @@ -[dependencies.uniquote] -version = "3.0" -optional = true +- [dev-dependencies.getrandom] version = "0.2" diff --git a/rust-os_str_bytes.spec b/rust-os_str_bytes.spec index 5565fdc..3a84b71 100644 --- a/rust-os_str_bytes.spec +++ b/rust-os_str_bytes.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate os_str_bytes Name: rust-%{crate} -Version: 6.0.0 +Version: 6.0.1 Release: %autorelease Summary: Utilities for converting between byte sequences and platform-native strings @@ -19,7 +19,7 @@ Patch0: os_str_bytes-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Utilities for converting between byte sequences and platform-native strings.} @@ -36,9 +36,11 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license COPYRIGHT LICENSE-APACHE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/COPYRIGHT +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,7 +52,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}+memchr-devel Summary: %{summary} @@ -62,7 +64,7 @@ This package contains library source intended for building other packages which use the "memchr" feature of the "%{crate}" crate. %files -n %{name}+memchr-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+raw_os_str-devel Summary: %{summary} @@ -74,7 +76,7 @@ This package contains library source intended for building other packages which use the "raw_os_str" feature of the "%{crate}" crate. %files -n %{name}+raw_os_str-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 e9443ac..ca0e01b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os_str_bytes-6.0.0.crate) = d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8 +SHA512 (os_str_bytes-6.0.1.crate) = 16035d3032d499575faf5e8114868d57826acf2b4a54e848f9101713b7965a2fecd6c486945b1c8ccc3ddacdbb95a1c6f8a74ca4fcdee24729648edc817c4472 From 7a5cb7310bfa0bd82fbe7b307929198687451462 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 16 Jul 2022 16:29:37 +0200 Subject: [PATCH 4/7] Update to version 6.1.0; Fixes RHBZ#2090543 --- .gitignore | 1 + os_str_bytes-fix-metadata.diff | 4 ++-- rust-os_str_bytes.spec | 2 +- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e6f7ca2..3aa1d09 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /os_str_bytes-5.0.0.crate /os_str_bytes-6.0.0.crate /os_str_bytes-6.0.1.crate +/os_str_bytes-6.1.0.crate diff --git a/os_str_bytes-fix-metadata.diff b/os_str_bytes-fix-metadata.diff index 001e1f5..9c6547d 100644 --- a/os_str_bytes-fix-metadata.diff +++ b/os_str_bytes-fix-metadata.diff @@ -1,5 +1,5 @@ ---- os_str_bytes-6.0.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ os_str_bytes-6.0.1/Cargo.toml 2022-05-23T16:47:56.682610+00:00 +--- os_str_bytes-6.1.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ os_str_bytes-6.1.0/Cargo.toml 2022-07-16T14:28:30.213036+00:00 @@ -56,14 +56,6 @@ version = "2.4" optional = true diff --git a/rust-os_str_bytes.spec b/rust-os_str_bytes.spec index 3a84b71..7d0f34e 100644 --- a/rust-os_str_bytes.spec +++ b/rust-os_str_bytes.spec @@ -5,7 +5,7 @@ %global crate os_str_bytes Name: rust-%{crate} -Version: 6.0.1 +Version: 6.1.0 Release: %autorelease Summary: Utilities for converting between byte sequences and platform-native strings diff --git a/sources b/sources index ca0e01b..46e8fd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os_str_bytes-6.0.1.crate) = 16035d3032d499575faf5e8114868d57826acf2b4a54e848f9101713b7965a2fecd6c486945b1c8ccc3ddacdbb95a1c6f8a74ca4fcdee24729648edc817c4472 +SHA512 (os_str_bytes-6.1.0.crate) = b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5 From 6e05e98fafcad3db7b4b254ad790f9fe291e96af Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 29 Jul 2022 22:39:43 +0200 Subject: [PATCH 6/7] Update to version 6.2.0; Fixes RHBZ#2107860 --- .gitignore | 1 + os_str_bytes-fix-metadata.diff | 17 ----------------- rust-os_str_bytes.spec | 28 ++++++++++++++++++---------- rust2rpm.conf | 3 +++ sources | 2 +- 5 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 os_str_bytes-fix-metadata.diff create mode 100644 rust2rpm.conf diff --git a/.gitignore b/.gitignore index 3aa1d09..13baf39 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /os_str_bytes-6.0.0.crate /os_str_bytes-6.0.1.crate /os_str_bytes-6.1.0.crate +/os_str_bytes-6.2.0.crate diff --git a/os_str_bytes-fix-metadata.diff b/os_str_bytes-fix-metadata.diff deleted file mode 100644 index 9c6547d..0000000 --- a/os_str_bytes-fix-metadata.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- os_str_bytes-6.1.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ os_str_bytes-6.1.0/Cargo.toml 2022-07-16T14:28:30.213036+00:00 -@@ -56,14 +56,6 @@ - version = "2.4" - optional = true - --[dependencies.print_bytes] --version = "0.5" --optional = true -- --[dependencies.uniquote] --version = "3.0" --optional = true -- - [dev-dependencies.getrandom] - version = "0.2" - diff --git a/rust-os_str_bytes.spec b/rust-os_str_bytes.spec index 7d0f34e..0a7b5e0 100644 --- a/rust-os_str_bytes.spec +++ b/rust-os_str_bytes.spec @@ -1,28 +1,24 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate os_str_bytes -Name: rust-%{crate} -Version: 6.1.0 +Name: rust-os_str_bytes +Version: 6.2.0 Release: %autorelease -Summary: Utilities for converting between byte sequences and platform-native strings +Summary: Convert between byte sequences and platform-native strings -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/os_str_bytes Source: %{crates_source} -# Initial patched metadata -# * drop optional dependencies that are not packaged for Fedora -Patch0: os_str_bytes-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging >= 21 %global _description %{expand: -Utilities for converting between byte sequences and platform-native strings.} +Convert between byte sequences and platform-native strings.} %description %{_description} @@ -66,6 +62,18 @@ use the "memchr" feature of the "%{crate}" crate. %files -n %{name}+memchr-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}+raw_os_str-devel Summary: %{summary} BuildArch: noarch diff --git a/rust2rpm.conf b/rust2rpm.conf new file mode 100644 index 0000000..1c973b4 --- /dev/null +++ b/rust2rpm.conf @@ -0,0 +1,3 @@ +[DEFAULT] +unwanted-features = + uniquote diff --git a/sources b/sources index 46e8fd4..041b0ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os_str_bytes-6.1.0.crate) = b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5 +SHA512 (os_str_bytes-6.2.0.crate) = aecfd7ad0433ffe532d72c6c269eefb7e7097cc1acdfe91511ecdaa7ad4db5d97026268bd216c70bf4fe17f23bc02b1fbbe95a28b8fedda3f812b3ce78723c75 From 9c0058e909b4f76390923550136e55d3329180c4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 16 Aug 2022 15:50:30 +0200 Subject: [PATCH 7/7] Update to version 6.3.0; Fixes RHBZ#2118094 --- .gitignore | 1 + rust-os_str_bytes.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 13baf39..851385a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /os_str_bytes-6.0.1.crate /os_str_bytes-6.1.0.crate /os_str_bytes-6.2.0.crate +/os_str_bytes-6.3.0.crate diff --git a/rust-os_str_bytes.spec b/rust-os_str_bytes.spec index 0a7b5e0..e0aa3c0 100644 --- a/rust-os_str_bytes.spec +++ b/rust-os_str_bytes.spec @@ -5,7 +5,7 @@ %global crate os_str_bytes Name: rust-os_str_bytes -Version: 6.2.0 +Version: 6.3.0 Release: %autorelease Summary: Convert between byte sequences and platform-native strings @@ -50,6 +50,18 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+checked_conversions-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+checked_conversions-devel %{_description} + +This package contains library source intended for building other packages which +use the "checked_conversions" feature of the "%{crate}" crate. + +%files -n %{name}+checked_conversions-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+memchr-devel Summary: %{summary} BuildArch: noarch diff --git a/sources b/sources index 041b0ea..6654798 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os_str_bytes-6.2.0.crate) = aecfd7ad0433ffe532d72c6c269eefb7e7097cc1acdfe91511ecdaa7ad4db5d97026268bd216c70bf4fe17f23bc02b1fbbe95a28b8fedda3f812b3ce78723c75 +SHA512 (os_str_bytes-6.3.0.crate) = 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e