From 3c7fbaef5c707a2b35dffdedfad2481564015add Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 28 Nov 2022 22:01:00 +0100 Subject: [PATCH 1/4] Update to version 0.9.0; Fixes RHBZ#2093654 --- rust-serial_test.spec | 62 ++++++++++++++++++++++++++++++----- serial_test-fix-metadata.diff | 25 +++++++------- sources | 2 +- 3 files changed, 66 insertions(+), 23 deletions(-) diff --git a/rust-serial_test.spec b/rust-serial_test.spec index a5f8de3..f91d1d7 100644 --- a/rust-serial_test.spec +++ b/rust-serial_test.spec @@ -1,23 +1,19 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate serial_test -Name: rust-%{crate} -Version: 0.6.0 +Name: rust-serial_test +Version: 0.9.0 Release: %autorelease Summary: Allows for the creation of serialised Rust tests -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/serial_test Source: %{crates_source} -# Initial patched metadata -# * drop doc-specific dependencies (only used when building docs on docs.rs) -Patch0: serial_test-fix-metadata.diff - -ExclusiveArch: %{rust_arches} +# Manually created patch for downstream crate metadata changes +Patch: serial_test-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -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}+async-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+async-devel %{_description} + +This package contains library source intended for building other packages which +use the "async" feature of the "%{crate}" crate. + +%files -n %{name}+async-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+file_locks-devel Summary: %{summary} BuildArch: noarch @@ -76,6 +84,42 @@ use the "fslock" feature of the "%{crate}" crate. %files -n %{name}+fslock-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+futures-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+futures-devel %{_description} + +This package contains library source intended for building other packages which +use the "futures" feature of the "%{crate}" crate. + +%files -n %{name}+futures-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+log-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+log-devel %{_description} + +This package contains library source intended for building other packages which +use the "log" feature of the "%{crate}" crate. + +%files -n %{name}+log-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 + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep diff --git a/serial_test-fix-metadata.diff b/serial_test-fix-metadata.diff index 5c4c9bf..293068f 100644 --- a/serial_test-fix-metadata.diff +++ b/serial_test-fix-metadata.diff @@ -1,21 +1,20 @@ ---- serial_test-0.6.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ serial_test-0.6.0/Cargo.toml 2022-04-12T10:01:55.038717+00:00 -@@ -20,12 +20,6 @@ - categories = ["development-tools::testing"] - license = "MIT" - repository = "https://github.com/palfrey/serial_test/" --[package.metadata.docs.rs] --all-features = true --rustdoc-args = ["--cfg", "docsrs"] +--- serial_test-0.9.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ serial_test-0.9.0/Cargo.toml 2022-11-28T14:00:56.711227+00:00 +@@ -34,10 +34,6 @@ + + [dependencies.dashmap] + version = "5" +- -[dependencies.document-features] -version = "0.2" -optional = true [dependencies.fslock] version = "0.2" -@@ -42,5 +36,4 @@ - - [features] - default = [] +@@ -78,6 +74,5 @@ + "logging", + "async", + ] -docsrs = ["document-features"] file_locks = ["fslock"] + logging = ["log"] diff --git a/sources b/sources index a27c46a..c5d9b2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (serial_test-0.6.0.crate) = 36340e6234b44ef99d0e4f25a6f98dbe080cb0c2b0de06bdb8fe72cf7c6398110ca0489e556b7ba24be708e7fae3fc63400075e1d061a86d5d612d70b216d46f +SHA512 (serial_test-0.9.0.crate) = 2ecd241cfb43f061e3c97ea6e8e00561ff812966ad79f6a52954ee5f49f7a2ed790166cf9588d9a1b467cf30923b53d4c387e40311f7e1bf0483a8081bcf8ff3 From 8eede1a7e33858d6b07f8f41febf347672d3d6e1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 20 Feb 2023 11:19:23 +0000 Subject: [PATCH 3/4] Update to 1.0.0 --- rust-serial_test.spec | 30 ++++++++++++++++++++++++++---- sources | 2 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/rust-serial_test.spec b/rust-serial_test.spec index f91d1d7..01aca09 100644 --- a/rust-serial_test.spec +++ b/rust-serial_test.spec @@ -1,19 +1,17 @@ -# Generated by rust2rpm 23 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate serial_test Name: rust-serial_test -Version: 0.9.0 +Version: 1.0.0 Release: %autorelease Summary: Allows for the creation of serialised Rust tests License: MIT URL: https://crates.io/crates/serial_test Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -Patch: serial_test-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -60,6 +58,30 @@ use the "async" feature of the "%{crate}" crate. %files -n %{name}+async-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+docsrs-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+docsrs-devel %{_description} + +This package contains library source intended for building other packages which +use the "docsrs" feature of the "%{crate}" crate. + +%files -n %{name}+docsrs-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+document-features-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+document-features-devel %{_description} + +This package contains library source intended for building other packages which +use the "document-features" feature of the "%{crate}" crate. + +%files -n %{name}+document-features-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+file_locks-devel Summary: %{summary} BuildArch: noarch diff --git a/sources b/sources index c5d9b2b..a918e6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (serial_test-0.9.0.crate) = 2ecd241cfb43f061e3c97ea6e8e00561ff812966ad79f6a52954ee5f49f7a2ed790166cf9588d9a1b467cf30923b53d4c387e40311f7e1bf0483a8081bcf8ff3 +SHA512 (serial_test-1.0.0.crate) = d87d35acefcd483408c1f78fbf3d66a4c7a13f1f8ce3b0065781dfd436b8fd6ffaec22f87bb3ca238c199fac4ef4b4a867dd27b831ba7bedb6a051930d1aacf5 From 1025a1085fab3d5123d4e1dd023020891855f6a9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 21 Feb 2023 20:41:22 +0100 Subject: [PATCH 4/4] Re-apply accidentally dropped patch --- rust-serial_test.spec | 27 +++------------------------ serial_test-fix-metadata.diff | 6 +++--- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/rust-serial_test.spec b/rust-serial_test.spec index 01aca09..621ab9c 100644 --- a/rust-serial_test.spec +++ b/rust-serial_test.spec @@ -12,6 +12,9 @@ Summary: Allows for the creation of serialised Rust tests License: MIT URL: https://crates.io/crates/serial_test Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * drop doc-specific dependencies (only used when building docs on docs.rs) +Patch: serial_test-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -58,30 +61,6 @@ use the "async" feature of the "%{crate}" crate. %files -n %{name}+async-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+docsrs-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+docsrs-devel %{_description} - -This package contains library source intended for building other packages which -use the "docsrs" feature of the "%{crate}" crate. - -%files -n %{name}+docsrs-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+document-features-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+document-features-devel %{_description} - -This package contains library source intended for building other packages which -use the "document-features" feature of the "%{crate}" crate. - -%files -n %{name}+document-features-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+file_locks-devel Summary: %{summary} BuildArch: noarch diff --git a/serial_test-fix-metadata.diff b/serial_test-fix-metadata.diff index 293068f..132e13c 100644 --- a/serial_test-fix-metadata.diff +++ b/serial_test-fix-metadata.diff @@ -1,5 +1,5 @@ ---- serial_test-0.9.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ serial_test-0.9.0/Cargo.toml 2022-11-28T14:00:56.711227+00:00 +--- serial_test-1.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ serial_test-1.0.0/Cargo.toml 2023-02-21T19:38:47.185565+00:00 @@ -34,10 +34,6 @@ [dependencies.dashmap] @@ -11,7 +11,7 @@ [dependencies.fslock] version = "0.2" -@@ -78,6 +74,5 @@ +@@ -81,6 +77,5 @@ "logging", "async", ]