From c6ee3e121401be49120100c6b3f9c334d40665ba Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 21 Aug 2023 14:44:52 -0500 Subject: [PATCH] Update to 0.50.0 Signed-off-by: Michel Alexandre Salim --- .gitignore | 1 + difftastic-fix-metadata.diff | 12 ++++++------ rust-difftastic.spec | 8 +++++--- sources | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 2a69423..f69bd03 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /difftastic-0.43.1.crate /difftastic-0.45.0.crate /difftastic-0.49.0.crate +/difftastic-0.50.0.crate diff --git a/difftastic-fix-metadata.diff b/difftastic-fix-metadata.diff index ea7e003..0376296 100644 --- a/difftastic-fix-metadata.diff +++ b/difftastic-fix-metadata.diff @@ -1,6 +1,6 @@ ---- difftastic-0.49.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ difftastic-0.49.0/Cargo.toml 2023-08-05T02:39:11.386136+00:00 -@@ -63,7 +63,7 @@ +--- difftastic-0.50.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ difftastic-0.50.0/Cargo.toml 2023-08-21T19:16:46.510771+00:00 +@@ -66,7 +66,7 @@ version = "0.2.108" [dependencies.libmimalloc-sys] @@ -9,8 +9,8 @@ [dependencies.log] version = "0.4.14" -@@ -85,7 +85,7 @@ - version = "1.6.1" +@@ -88,7 +88,7 @@ + version = "1.7.0" [dependencies.regex] -version = ">= 1.7, < 1.8" @@ -18,7 +18,7 @@ [dependencies.rustc-hash] version = "1.1.0" -@@ -115,10 +115,10 @@ +@@ -118,10 +118,10 @@ [dependencies.wu-diff] version = "0.1.2" [dev-dependencies.assert_cmd] diff --git a/rust-difftastic.spec b/rust-difftastic.spec index d1657e9..7f2fa78 100644 --- a/rust-difftastic.spec +++ b/rust-difftastic.spec @@ -4,7 +4,7 @@ %global crate difftastic Name: rust-difftastic -Version: 0.49.0 +Version: 0.50.0 Release: %autorelease Summary: Structural diff that understands syntax @@ -16,7 +16,7 @@ Source: %{crates_source} # * remove upper bound on assert_cmd, predicates, and regex Patch: difftastic-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: rust-packaging >= 23 %global _description %{expand: A structural diff that understands syntax.} @@ -25,7 +25,8 @@ A structural diff that understands syntax.} %package -n %{crate} Summary: %{summary} -License: (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND MIT AND (MIT OR Unlicense) AND Unicode-DFS-2016 AND Zlib +# from %%cargo_license_summar +License: # (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (Unlicense OR MIT) AND Zlib # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} @@ -45,6 +46,7 @@ License: (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exce %build %cargo_build +%{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %install diff --git a/sources b/sources index 2a4c815..67e5679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (difftastic-0.49.0.crate) = 70e36733c2ecb9df1702a747e2d641ccdc8df4226f463e8810b87f813891d5eb77275eed12dc46da73dcd11fbe4db330be0f28a2313e71674ef64361386f549b +SHA512 (difftastic-0.50.0.crate) = c0e78a56d53ca76e75e898f0a6d4fa0683e193cd116d9e0d7b3a4cf6738a78e6932ef27ff021bbb8907f03750782fff5beac3fbe02d6915b4e50d6051ea79888