From 7d60ae57e0d07853735bd14e85a8e3c5f37c1cb7 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr@fedoraproject.org>
Date: Fri, 6 Jan 2023 18:39:29 -0800
Subject: [PATCH] Update to 1.11.0 (#2157519)

---
 .gitignore             |  2 +-
 just-fix-metadata.diff | 19 ++++++++++++++-----
 rust-just.spec         | 14 +++++++++++++-
 sources                |  2 +-
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 536eccd..df3b031 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /*.src.rpm
 /results_*/
-/just-1.9.0.crate
+/just-1.11.0.crate
diff --git a/just-fix-metadata.diff b/just-fix-metadata.diff
index ad2c0c5..861b3f8 100644
--- a/just-fix-metadata.diff
+++ b/just-fix-metadata.diff
@@ -1,7 +1,7 @@
---- just-1.9.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ just-1.9.0/Cargo.toml	2022-09-30T00:37:34.996094+00:00
-@@ -15,9 +15,16 @@
- version = "1.9.0"
+--- just-1.11.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ just-1.11.0/Cargo.toml	2023-01-02T17:35:08+00:00
+@@ -15,9 +15,16 @@ name = "just"
+ version = "1.11.0"
  authors = ["Casey Rodarmor <casey@rodarmor.com>"]
  exclude = [
 +    "/Vagrantfile",
@@ -17,7 +17,16 @@
      "/www",
  ]
  autotests = false
-@@ -133,9 +139,6 @@
+@@ -75,7 +82,7 @@ version = "0.15"
+ version = "2.0.0"
+ 
+ [dependencies.env_logger]
+-version = "0.10.0"
++version = "0.9.3"
+ 
+ [dependencies.heck]
+ version = "0.4.0"
+@@ -132,9 +139,6 @@ version = "0.1.0"
  version = "1.0.0"
  features = ["v4"]
  
diff --git a/rust-just.spec b/rust-just.spec
index 9459697..21ac4e9 100644
--- a/rust-just.spec
+++ b/rust-just.spec
@@ -4,7 +4,7 @@
 %global crate just
 
 Name:           rust-just
-Version:        1.9.0
+Version:        1.11.0
 Release:        %autorelease
 Summary:        Just a command runner
 
@@ -14,6 +14,7 @@ Source:         %{crates_source}
 # Initial patched metadata
 # - Exclude unwanted files
 # - Drop cradle dependency, the crate cannot be packaged due to CC0 license
+# - Downgrade env_logger dependency to 0.9 (0.10 is blocked by fedora-rust/rust2rpm#186)
 Patch0:         just-fix-metadata.diff
 # Remove all uses of cradle
 Patch1:         just-1.5.0-no-cradle.patch
@@ -29,11 +30,21 @@ just is a handy way to save and run project-specific commands.}
 
 %package     -n %{crate}
 Summary:        %{summary}
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# Apache-2.0
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR MIT
+# CC0-1.0
+# MIT
+# MIT OR Apache-2.0
+# Unlicense OR MIT
+License:        CC0-1.0 AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND MIT AND Unicode-DFS-2016 AND (Unlicense OR MIT)
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
 %license LICENSE
+%license LICENSE.dependencies
 %doc CHANGELOG.md
 %doc CONTRIBUTING.md
 %doc GRAMMAR.md
@@ -99,6 +110,7 @@ use the "help4help2man" feature of the "%{crate}" crate.
 
 %build
 %cargo_build
+%{?cargo_license} >LICENSE.dependencies
 
 %install
 %cargo_install
diff --git a/sources b/sources
index bf8aa5e..3112401 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (just-1.9.0.crate) = 0912285c742ae6281e0149d42790b75cf1b10943ef45a8f8260c07df7b89cf2dcc96c11e2464b379a61386e12af726b1fae2ce6ed4e1045774ec660a9b25714f
+SHA512 (just-1.11.0.crate) = 015adc0a3e38cf114278e4d1877ea65fd9c5ad3427a6bb82ad2661a0d6f1a50cae2c4481167d1cb65dcd262924e9f306ea4140826def1b363edcd1247d99da8f