From bbb1f8e208e36472de27d207243e2e8799d3c11c Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Tue, 8 Aug 2023 13:32:33 +0200
Subject: [PATCH] Bump askama dependency from 0.11 to 0.12

---
 rust-zoxide.spec              | 13 +++++--------
 rust2rpm.conf                 |  7 +++++++
 zoxide-fix-metadata-auto.diff |  2 +-
 zoxide-fix-metadata.diff      | 29 ++++++++---------------------
 4 files changed, 21 insertions(+), 30 deletions(-)
 create mode 100644 rust2rpm.conf

diff --git a/rust-zoxide.spec b/rust-zoxide.spec
index 816ab56..87894c0 100644
--- a/rust-zoxide.spec
+++ b/rust-zoxide.spec
@@ -15,10 +15,11 @@ Source:         %{crates_source}
 # Automatically generated patch to strip foreign dependencies
 Patch:          zoxide-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
+# * bump askama dependency from 0.11 to 0.12
 # * drop incompatible compiler flag settings (strip = true, debug = 0)
 Patch:          zoxide-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  rust-packaging >= 23
 
 %global _description %{expand:
 A smarter cd command for your terminal.}
@@ -27,15 +28,12 @@ A smarter cd command for your terminal.}
 
 %package     -n %{crate}
 Summary:        %{summary}
-
-# (MIT OR Apache-2.0) AND Unicode-DFS-2016
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-# CC0-1.0 OR MIT-0
+# CC0-1.0 OR MIT-0 OR Apache-2.0
 # MIT
 # MIT OR Apache-2.0
-# Unlicense OR MIT
-License:        MIT AND MIT-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 (Unlicense OR MIT)
+License:        MIT AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (CC0-1.0 OR MIT-0 OR Apache-2.0)
 # LICENSE.dependencies contains a full license breakdown
 
 # recommend fuzzy finder for interactive completions
@@ -70,8 +68,7 @@ echo '/usr/bin/zsh'
 
 %build
 %cargo_build
-# write license summary and breakdown
-%cargo_license_summary
+%{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 
 %install
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..52c76db
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+testrequires =
+  /usr/bin/bash
+  /usr/bin/fish
+  /usr/bin/shellcheck
+  /usr/bin/xonsh
+  /usr/bin/zsh
diff --git a/zoxide-fix-metadata-auto.diff b/zoxide-fix-metadata-auto.diff
index 692906b..93d66d8 100644
--- a/zoxide-fix-metadata-auto.diff
+++ b/zoxide-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
 --- zoxide-0.9.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ zoxide-0.9.0/Cargo.toml	2023-04-19T14:54:52.893929+00:00
++++ zoxide-0.9.0/Cargo.toml	2023-08-08T11:21:10.317749+00:00
 @@ -147,8 +147,5 @@
  ]
  default-features = false
diff --git a/zoxide-fix-metadata.diff b/zoxide-fix-metadata.diff
index c94f61c..281d213 100644
--- a/zoxide-fix-metadata.diff
+++ b/zoxide-fix-metadata.diff
@@ -1,6 +1,6 @@
 --- zoxide-0.9.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ zoxide-0.9.0/Cargo.toml	2023-04-19T14:55:15.175976+00:00
-@@ -76,8 +76,6 @@
++++ zoxide-0.9.0/Cargo.toml	2023-08-08T11:21:29.269742+00:00
+@@ -76,14 +76,12 @@
  [profile.release]
  lto = true
  codegen-units = 1
@@ -9,23 +9,10 @@
  
  [dependencies.anyhow]
  version = "1.0.32"
-@@ -112,19 +110,6 @@
- version = "1.0.116"
- features = ["derive"]
  
--[dev-dependencies.assert_cmd]
--version = "2.0.0"
--
--[dev-dependencies.rstest]
--version = "0.16.0"
--default-features = false
--
--[dev-dependencies.rstest_reuse]
--version = "0.4.0"
--
--[dev-dependencies.tempfile]
--version = "3.1.0"
--
- [build-dependencies.clap]
- version = "4.0.0"
- features = ["derive"]
+ [dependencies.askama]
+-version = "0.11.0"
++version = "0.12.0"
+ default-features = false
+ 
+ [dependencies.bincode]