From fa19028afcd968bb73a704c2fcd76609588c5fb6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 13 Jun 2023 17:17:31 +0200 Subject: [PATCH] Regenerate with rust2rpm v24 --- README.md | 3 -- clircle-fix-metadata-auto.diff | 9 ++++++ clircle-fix-metadata.diff | 9 ++---- rust-clircle.spec | 50 ++++++++++++++-------------------- 4 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 README.md create mode 100644 clircle-fix-metadata-auto.diff diff --git a/README.md b/README.md deleted file mode 100644 index b413d9e..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-clircle - -The rust-clircle package diff --git a/clircle-fix-metadata-auto.diff b/clircle-fix-metadata-auto.diff new file mode 100644 index 0000000..edde0bb --- /dev/null +++ b/clircle-fix-metadata-auto.diff @@ -0,0 +1,9 @@ +--- clircle-0.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ clircle-0.3.0/Cargo.toml 2023-06-13T15:11:32.876445+00:00 +@@ -39,6 +39,3 @@ + version = "0.2" + [target."cfg(not(windows))".dev-dependencies.nix] + version = "0.19.1" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = ["winnt", "winbase", "processenv", "handleapi", "ntdef", "fileapi"] diff --git a/clircle-fix-metadata.diff b/clircle-fix-metadata.diff index 8760555..6f9d99e 100644 --- a/clircle-fix-metadata.diff +++ b/clircle-fix-metadata.diff @@ -1,11 +1,8 @@ --- clircle-0.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ clircle-0.3.0/Cargo.toml 2021-11-14T17:27:00.007824+00:00 -@@ -38,7 +38,4 @@ ++++ clircle-0.3.0/Cargo.toml 2023-06-13T15:11:47.561509+00:00 +@@ -38,4 +38,4 @@ [target."cfg(not(windows))".dependencies.libc] version = "0.2" [target."cfg(not(windows))".dev-dependencies.nix] -version = "0.19.1" --[target."cfg(windows)".dependencies.winapi] --version = "0.3.9" --features = ["winnt", "winbase", "processenv", "handleapi", "ntdef", "fileapi"] -+version = "0.22.0" ++version = "0.22" diff --git a/rust-clircle.spec b/rust-clircle.spec index fb3f6b6..578ae76 100644 --- a/rust-clircle.spec +++ b/rust-clircle.spec @@ -1,29 +1,25 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate clircle -Name: rust-%{crate} +Name: rust-clircle Version: 0.3.0 Release: %autorelease Summary: Detect IO circles in your CLI apps arguments -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +# https://github.com/niklasmohrin/clircle/issues/10 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/clircle Source: %{crates_source} -# Initial patched metadata -# * Remove Windows only dependencies -# * Bump nix to 0.22.0 -Patch0: clircle-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: clircle-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * bump nix dev-dependency from 0.19.1 to 0.22 +Patch: clircle-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Detect IO circles in your CLI apps arguments.} @@ -36,12 +32,12 @@ 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 -%doc examples README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +45,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}+serde-devel Summary: %{summary} @@ -61,11 +57,11 @@ BuildArch: noarch %description -n %{name}+serde-devel %{_description} -This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate. %files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -86,8 +82,4 @@ which use "serde" feature of "%{crate}" crate. %endif %changelog -* dim. nov. 14 2021 Robert-André Mauchin 0.3.0-2 -- Uncommitted changes - -* dim. nov. 14 2021 Robert-André Mauchin 0.3.0-1 -- Initial release +%autochangelog