From 8f3bf2bc908d43c929bfda93397ba70ce01547f1 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 4 Aug 2023 21:49:36 -0500
Subject: [PATCH] Update to 0.49.0

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
---
 .gitignore                   |  1 +
 difftastic-fix-metadata.diff | 27 ++++++++++++++++++---------
 rust-difftastic.spec         | 13 ++++---------
 sources                      |  2 +-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6741a2a..2a69423 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /difftastic-0.42.0.crate
 /difftastic-0.43.1.crate
 /difftastic-0.45.0.crate
+/difftastic-0.49.0.crate
diff --git a/difftastic-fix-metadata.diff b/difftastic-fix-metadata.diff
index ed88433..ea7e003 100644
--- a/difftastic-fix-metadata.diff
+++ b/difftastic-fix-metadata.diff
@@ -1,6 +1,6 @@
---- difftastic-0.45.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ difftastic-0.45.0/Cargo.toml	2023-03-06T18:55:43.980782+00:00
-@@ -56,7 +56,7 @@
+--- 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 @@
  version = "0.2.108"
  
  [dependencies.libmimalloc-sys]
@@ -9,16 +9,25 @@
  
  [dependencies.log]
  version = "0.4.14"
-@@ -104,10 +104,10 @@
+@@ -85,7 +85,7 @@
+ version = "1.6.1"
+ 
+ [dependencies.regex]
+-version = ">= 1.7, < 1.8"
++version = "1.7"
+ 
+ [dependencies.rustc-hash]
+ version = "1.1.0"
+@@ -115,10 +115,10 @@
  [dependencies.wu-diff]
  version = "0.1.2"
  [dev-dependencies.assert_cmd]
--version = "=2.0.5"
-+version = "2.0.4"
+-version = ">= 2, <= 2.0.5"
++version = "2"
  
  [dev-dependencies.predicates]
--version = "=2.1.1"
-+version = "2.1.1"
+-version = ">= 2, <= 2.1.1"
++version = "2"
  
  [dev-dependencies.pretty_assertions]
- version = "1.2.1"
+ version = "1.3.0"
diff --git a/rust-difftastic.spec b/rust-difftastic.spec
index 249006c..d1657e9 100644
--- a/rust-difftastic.spec
+++ b/rust-difftastic.spec
@@ -1,10 +1,10 @@
-# Generated by rust2rpm 23
+# Generated by rust2rpm 24
 %bcond_without check
 
 %global crate difftastic
 
 Name:           rust-difftastic
-Version:        0.45.0
+Version:        0.49.0
 Release:        %autorelease
 Summary:        Structural diff that understands syntax
 
@@ -12,9 +12,8 @@ License:        MIT
 URL:            https://crates.io/crates/difftastic
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * unpin assert_cmd and downgrade to 2.0.4 that is in EPEL 9
 # * unpin libmimalloc-sys
-# * unpin predicates
+# * remove upper bound on assert_cmd, predicates, and regex
 Patch:          difftastic-fix-metadata.diff
 
 BuildRequires:  rust-packaging >= 21
@@ -26,16 +25,14 @@ 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 Zlib
+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
 # LICENSE.dependencies contains a full license breakdown
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
 %license LICENSE
-%if 0%{?fedora}
 %license LICENSE.dependencies
-%endif
 %doc README.md
 %{_bindir}/difft
 
@@ -48,9 +45,7 @@ License:        (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exce
 
 %build
 %cargo_build
-%if 0%{?fedora}
 %{cargo_license} > LICENSE.dependencies
-%endif
 
 %install
 %cargo_install
diff --git a/sources b/sources
index 852f934..2a4c815 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (difftastic-0.45.0.crate) = 97746ac4f2aa8be658b02e1223b039754473c56ab02ad5881eccb2b7868d2a7a2511998dbcf92901ec66857787aec88c8c29df5bba257cf378fa7ed5d855c2e2
+SHA512 (difftastic-0.49.0.crate) = 70e36733c2ecb9df1702a747e2d641ccdc8df4226f463e8810b87f813891d5eb77275eed12dc46da73dcd11fbe4db330be0f28a2313e71674ef64361386f549b