From 16c98730d5cbad0bbd020987b71378ba02d63001 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Wed, 22 Apr 2020 18:14:52 -0700
Subject: [PATCH] Update to 4.1.1

---
 .gitignore                |  1 +
 rust-syntect.spec         | 70 ++++++++++++++++++++++++++++++++++++---
 sources                   |  2 +-
 syntect-fix-metadata.diff | 20 -----------
 4 files changed, 67 insertions(+), 26 deletions(-)
 delete mode 100644 syntect-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 6af1642..9ebff89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /syntect-3.1.0.crate
 /syntect-3.2.0.crate
 /syntect-3.3.0.crate
+/syntect-4.1.1.crate
diff --git a/rust-syntect.spec b/rust-syntect.spec
index 2332ad4..1b85273 100644
--- a/rust-syntect.spec
+++ b/rust-syntect.spec
@@ -6,17 +6,14 @@
 %global crate syntect
 
 Name:           rust-%{crate}
-Version:        3.3.0
-Release:        3%{?dist}
+Version:        4.1.1
+Release:        1%{?dist}
 Summary:        Library for high quality syntax highlighting and code intelligence
 
 # Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/syntect
 Source:         %{crates_source}
-# Initial patched metadata
-# * Upgrade to criterion 0.3 and plist 0.5, https://github.com/trishume/syntect/pull/277
-Patch0:         syntect-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -81,6 +78,30 @@ which use "bincode" feature of "%{crate}" crate.
 %files       -n %{name}+bincode-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
+%package     -n %{name}+default-fancy-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-fancy-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default-fancy" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-fancy-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package     -n %{name}+default-onig-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-onig-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default-onig" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-onig-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
 %package     -n %{name}+dump-create-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -129,6 +150,18 @@ which use "dump-load-rs" feature of "%{crate}" crate.
 %files       -n %{name}+dump-load-rs-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
+%package     -n %{name}+fancy-regex-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+fancy-regex-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "fancy-regex" feature of "%{crate}" crate.
+
+%files       -n %{name}+fancy-regex-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
 %package     -n %{name}+flate2-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -201,6 +234,30 @@ which use "parsing" feature of "%{crate}" crate.
 %files       -n %{name}+parsing-devel
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
+%package     -n %{name}+regex-fancy-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+regex-fancy-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "regex-fancy" feature of "%{crate}" crate.
+
+%files       -n %{name}+regex-fancy-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
+%package     -n %{name}+regex-onig-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+regex-onig-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "regex-onig" feature of "%{crate}" crate.
+
+%files       -n %{name}+regex-onig-devel
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+
 %package     -n %{name}+regex-syntax-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -256,6 +313,9 @@ which use "yaml-rust" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 4.1.1-1
+- Update to 4.1.1
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 2098d15..a7b4978 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (syntect-3.3.0.crate) = d0907fc89250312907e3f81bb4954fbb63193b7a96280ba54a0254f232b175bd8399be124f2c40ad61aaff759f5d799b17213da7aeeec6dd56e6244f64ec0220
+SHA512 (syntect-4.1.1.crate) = 8ac59cc1ce6820dfdde527b55a3c37f9491263a7d6a6bb6ea1436e2b6aafaedb76dafbc233f466e6eaf8873bcbfcdc4b16cb90f2042095da1c4081803a79d7f8
diff --git a/syntect-fix-metadata.diff b/syntect-fix-metadata.diff
deleted file mode 100644
index 101c195..0000000
--- a/syntect-fix-metadata.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- syntect-3.3.0/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ syntect-3.3.0/Cargo.toml	2020-01-16T20:29:16.728868+00:00
-@@ -62,7 +62,7 @@
- optional = true
- 
- [dependencies.plist]
--version = "0.4"
-+version = "0.5"
- 
- [dependencies.regex-syntax]
- version = "0.6"
-@@ -84,7 +84,7 @@
- version = "0.4"
- optional = true
- [dev-dependencies.criterion]
--version = "0.2"
-+version = "0.3"
- 
- [dev-dependencies.getopts]
- version = "0.2"