From db97c286abd4eff908ce6123731b0a22f51f1cb1 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code@musicinmybrain.net>
Date: Jun 20 2021 13:09:54 +0000
Subject: Update to 1.4.4


---

diff --git a/.gitignore b/.gitignore
index 427485e..1a84602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /strictyaml-1.3.1.tar.gz
 /strictyaml-1.3.2.tar.gz
 /strictyaml-ae2131a8dab9a341fd30b8334d69a4d319252cd1.tar.gz
+/strictyaml-1.4.4.tar.gz
diff --git a/LICENSE-ruamel-yaml b/LICENSE-ruamel-yaml
new file mode 100644
index 0000000..3f65b07
--- /dev/null
+++ b/LICENSE-ruamel-yaml
@@ -0,0 +1,21 @@
+ The MIT License (MIT)
+
+ Copyright (c) 2014-2021 Anthon van der Neut, Ruamel bvba
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/python-strictyaml.spec b/python-strictyaml.spec
index af2b78b..0f0d51a 100644
--- a/python-strictyaml.spec
+++ b/python-strictyaml.spec
@@ -1,18 +1,19 @@
 %global srcname strictyaml
 
-Name:           python-%{srcname}
-Version:        1.4.0
 %global forgeurl https://github.com/crdoconnor/%{srcname}/
-#%%global tag %%{version}
-# Upstream failed to tag the 1.4.0 release:
-%global commit ae2131a8dab9a341fd30b8334d69a4d319252cd1
+%global tag %{version}
+
+Name:           python-%{srcname}
+Version:        1.4.4
 %forgemeta
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Parses and validates a restricted subset of YAML
 
 License:        MIT
 URL:            http://hitchdev.com/%{srcname}
 Source0:        %{forgesource}
+# https://github.com/crdoconnor/strictyaml/issues/152
+Source1:        https://sourceforge.net/p/ruamel-yaml/code/ci/0.16.13/tree/LICENSE?format=raw#/LICENSE-ruamel-yaml
 
 BuildArch:      noarch
 
@@ -50,11 +51,20 @@ Priorities:
 %package -n     python3-%{srcname}
 Summary:        %{summary}
 
+# Upstream bundled/vendored a slightly older version of ruamel.yaml after an
+# update with API changes was too difficult to support. This is intended to be
+# a temporary workaround until the vendored library can be replaced with a
+# custom parser for StrictYAML. See
+# https://github.com/crdoconnor/strictyaml/issues/151 for discussion, and
+# strictyaml/ruamel/__init__.py for version information.
+Provides:       bundled(python3dist(ruamel-yaml)) = 0.16.13
+
 %description -n python3-%{srcname} %{common_description}
 
 
 %prep
 %forgesetup
+cp -p '%{SOURCE1}' .
 
 
 %build
@@ -71,12 +81,17 @@ Summary:        %{summary}
 
 
 %files -n python3-%{srcname} -f %{pyproject_files}
-%license LICENSE.txt
+%license LICENSE.txt LICENSE-ruamel-yaml
 %doc CHANGELOG.md
 %doc README.md
 
 
 %changelog
+* Sun Jun 20 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.4.4-1
+- Update to 1.4.4 (closes RHBZ#1974003)
+- The package now bundles ruamel.yaml 0.16.13 until the author can supply a
+  custom parser to replace it.
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.4.0-2
 - Rebuilt for Python 3.10
 
diff --git a/sources b/sources
index fa08b49..f54c207 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (strictyaml-ae2131a8dab9a341fd30b8334d69a4d319252cd1.tar.gz) = 48b81e9f0b0a7aa2002ee9de4722afcfd936b590d5140d980836f791f5520f0b8454cb4fcdbc9669fcbe5875fb518158ee457e728821baca616d1ea9aadd90ea
+SHA512 (strictyaml-1.4.4.tar.gz) = 14778612313f5f8e410bc276f7bb449711e4660f1ad1013ea4484c4d92e1fdcf5aa7694aab61087e5c14c3e701cb0c65478ef8fd6e2e36e933af4de2ea5ad3c1