From c03cbdff5b30f670ac2d8f7834673667abd487f88d9c9de01bc25044fea75bf0 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 27 Jun 2022 12:36:45 +0000
Subject: [PATCH] Accepting request 983792 from
 home:StevenK:branches:devel:tools:scm

- Update to 3.2.2:
  * Breezy now relies on an external fastbencode Python module.
  * Basic support for nested trees in Git repositories, in the form
    of Git submodules.
- Add fastbencode to {Build,}Requires.
- No longer skip a test that passes, and add another broken one.

OBS-URL: https://build.opensuse.org/request/show/983792
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/breezy?expand=0&rev=19
---
 breezy-3.2.1.tar.gz |  3 ---
 breezy-3.2.2.tar.gz |  3 +++
 breezy.changes      | 10 ++++++++++
 breezy.spec         | 12 +++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 breezy-3.2.1.tar.gz
 create mode 100644 breezy-3.2.2.tar.gz

diff --git a/breezy-3.2.1.tar.gz b/breezy-3.2.1.tar.gz
deleted file mode 100644
index bfd0d66..0000000
--- a/breezy-3.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0b268eb1a28a2af045280c37d021ae32d7ff175f4c9b99f33aad7db0b29d85c
-size 9445046
diff --git a/breezy-3.2.2.tar.gz b/breezy-3.2.2.tar.gz
new file mode 100644
index 0000000..b443cb4
--- /dev/null
+++ b/breezy-3.2.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:187a6e45208dd05d81750736720c83710cf48094f547ec4081c571259559a4d5
+size 9396541
diff --git a/breezy.changes b/breezy.changes
index 99fda1c..ec88ac2 100644
--- a/breezy.changes
+++ b/breezy.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jun 20 02:14:30 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 3.2.2:
+  * Breezy now relies on an external fastbencode Python module.
+  * Basic support for nested trees in Git repositories, in the form
+    of Git submodules.
+- Add fastbencode to {Build,}Requires.
+- No longer skip a test that passes, and add another broken one.
+
 -------------------------------------------------------------------
 Tue May 10 05:26:43 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/breezy.spec b/breezy.spec
index 5ff7390..a773eb4 100644
--- a/breezy.spec
+++ b/breezy.spec
@@ -17,7 +17,7 @@
 
 
 Name:           breezy
-Version:        3.2.1
+Version:        3.2.2
 Release:        0
 Summary:        Friendly distributed version control system
 License:        GPL-2.0-or-later
@@ -34,6 +34,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 Requires:       python3-configobj
 Requires:       python3-dulwich >= 0.19.11
+Requires:       python3-fastbencode
 Requires:       python3-fastimport >= 0.9.8
 Requires:       python3-patiencediff
 Suggests:       python3-launchpadlib >= 1.6.3
@@ -42,6 +43,7 @@ Obsoletes:      bzr < %{version}
 # SECTION test requirements
 BuildRequires:  python3-configobj
 BuildRequires:  python3-dulwich >= 0.19.11
+BuildRequires:  python3-fastbencode
 BuildRequires:  python3-fastimport >= 0.9.8
 BuildRequires:  python3-fixtures >= 1.3.0
 BuildRequires:  python3-patiencediff
@@ -73,10 +75,10 @@ echo ".so man1/brz.1" > %{buildroot}%{_mandir}/man1/bzr.1
 export PYTHONPATH=%{buildroot}%{python3_sitearch}
 export LANG=en_US.UTF8
 # log_C log_BOGUS - borked with py3.8+ as you can't change encoding
-# test_pack_revision - endswith first arg must be bytes or a tuple of bytes, not str
 # test_ancient_{ctime,mtime} - broken on aarch64 %%arm ppc ppc64le
 # test_distant_{ctime,mtime} - broken on %%arm
 # test_plugins lp#1927523
+# test_simple_local_git - pulls in forbidden modules with 3.10+
 %{buildroot}%{_bindir}/bzr selftest -v --parallel=fork \
   -Oselftest.timeout=6000 -x bash_completion \
   -x breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh -x test_export_pot \
@@ -89,15 +91,15 @@ export LANG=en_US.UTF8
   -x breezy.tests.test__dirstate_helpers.TestPackStat.test_distant_ctime \
   -x breezy.tests.test__dirstate_helpers.TestPackStat.test_distant_mtime \
 %endif
-  -x breezy.tests.test_xml.TestSerializer.test_pack_revision_5 \
   -x breezy.tests.test_xml.TestSerializer.test_revision_text_v8 \
   -x breezy.tests.test_xml.TestSerializer.test_revision_text_v7 \
   -x breezy.tests.test_xml.TestSerializer.test_revision_text_v6 \
   -x breezy.tests.test_plugins.TestPlugins \
-  -x breezy.tests.test_plugins.TestLoadingPlugins.test_plugin_with_error
+  -x breezy.tests.test_plugins.TestLoadingPlugins.test_plugin_with_error \
+  -x breezy.tests.test_import_tariff.TestImportTariffs.test_simple_local_git
 
 %files
-%doc NEWS README.rst README_BDIST_RPM
+%doc NEWS README.rst
 %license COPYING.txt
 %{_bindir}/bzr-receive-pack
 %{_bindir}/bzr-upload-pack