From 86f88ec54c79c1f2f3ebd1f2f4fa52d5c9ccdaa3b151d7cc6dd11bd210604243 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 7 Jun 2023 16:35:44 +0000
Subject: [PATCH] - Update to 3.3.3:   - Plenty of bug fixes   - Drop support
 for the ubuntu: and debianlp: aliases.     These imports have long been
 broken.   - Fix support for newer versions of Dulwich.   - Update Git code to
 use newer Dulwich APIs for pack generation,     significantly improving
 performance. - Remove upstreamed patch skip_lp2003710.patch.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/breezy?expand=0&rev=27
---
 breezy-3.3.2.tar.gz   |  3 ---
 breezy-3.3.3.tar.gz   |  3 +++
 breezy.changes        | 12 ++++++++++++
 breezy.spec           |  6 ++----
 skip_lp2003710.patch  | 24 ------------------------
 vendor-lib-rio.tar.xz |  4 ++--
 vendor.tar.xz         |  4 ++--
 7 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 breezy-3.3.2.tar.gz
 create mode 100644 breezy-3.3.3.tar.gz
 delete mode 100644 skip_lp2003710.patch

diff --git a/breezy-3.3.2.tar.gz b/breezy-3.3.2.tar.gz
deleted file mode 100644
index f51d2de..0000000
--- a/breezy-3.3.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ea6949fcbb076b978545b099fac68abad35d6fa1899deef4f6b82a3dba257c1
-size 9450523
diff --git a/breezy-3.3.3.tar.gz b/breezy-3.3.3.tar.gz
new file mode 100644
index 0000000..03364dc
--- /dev/null
+++ b/breezy-3.3.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ab5e6c69eb7ba36b995f3c83e33e7be1d5dfcac2b9283888e1e0c61e47030e7
+size 9444789
diff --git a/breezy.changes b/breezy.changes
index 77e3d40..3d284da 100644
--- a/breezy.changes
+++ b/breezy.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jun  7 16:00:14 UTC 2023 - Matej Cepl <mcepl@suse.com>
+
+- Update to 3.3.3:
+  - Plenty of bug fixes
+  - Drop support for the ubuntu: and debianlp: aliases.
+    These imports have long been broken.
+  - Fix support for newer versions of Dulwich.
+  - Update Git code to use newer Dulwich APIs for pack generation,
+    significantly improving performance.
+- Remove upstreamed patch skip_lp2003710.patch.
+
 -------------------------------------------------------------------
 Mon Jan 23 07:45:54 UTC 2023 - Matej Cepl <mcepl@suse.com>
 
diff --git a/breezy.spec b/breezy.spec
index 3385e32..2d3f9c8 100644
--- a/breezy.spec
+++ b/breezy.spec
@@ -19,7 +19,7 @@
 %define rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
 
 Name:           breezy
-Version:        3.3.2
+Version:        3.3.3
 Release:        0
 Summary:        Distributed version control system with multi-format support
 License:        GPL-2.0-or-later
@@ -28,9 +28,6 @@ Source0:        https://files.pythonhosted.org/packages/source/b/breezy/breezy-%
 Source90:       cargo_config
 Source98:       vendor-lib-rio.tar.xz
 Source99:       vendor.tar.xz
-# PATCH-FIX-UPSTREAM skip_lp2003710.patch lp#2003710 mcepl@suse.com
-# Skip failing tests
-Patch0:         skip_lp2003710.patch
 BuildRequires:  cargo >= 1.41.0
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -54,6 +51,7 @@ Requires:       python3-fastbencode
 Requires:       python3-fastimport >= 0.9.8
 Requires:       python3-merge3
 Requires:       python3-patiencediff
+Requires:       python3-urllib3
 Suggests:       python3-launchpadlib >= 1.6.3
 Provides:       bzr = %{version}
 Obsoletes:      bzr < %{version}
diff --git a/skip_lp2003710.patch b/skip_lp2003710.patch
deleted file mode 100644
index 669df7b..0000000
--- a/skip_lp2003710.patch
+++ /dev/null
@@ -1,24 +0,0 @@
----
- breezy/tests/test_selftest.py |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: breezy-3.3.2/breezy/tests/test_selftest.py
-===================================================================
---- breezy-3.3.2.orig/breezy/tests/test_selftest.py
-+++ breezy-3.3.2/breezy/tests/test_selftest.py
-@@ -165,6 +165,7 @@ class TestTransportScenarios(tests.TestC
-         scenarios = transport_test_permutations()
-         self.assertEqual(permutation_count, len(scenarios))
- 
-+    @tests.unittest.skip('test failing (lp#2003710)')
-     def test_scenarios_include_transport_class(self):
-         # This test used to know about all the possible transports and the
-         # order they were returned but that seems overly brittle (mbp
-@@ -3098,6 +3099,7 @@ class TestTestSuite(tests.TestCase):
-             ],
-             test_list)
- 
-+    @tests.unittest.skip('test failing (lp#2003710)')
-     def test_test_suite(self):
-         # test_suite() loads the entire test suite to operate. To avoid this
-         # overhead, and yet still be confident that things are happening,
diff --git a/vendor-lib-rio.tar.xz b/vendor-lib-rio.tar.xz
index 220aa3a..1e9c268 100644
--- a/vendor-lib-rio.tar.xz
+++ b/vendor-lib-rio.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6954791f9f13fa9344a969e2fe1df1032f4a650cf4d263354092f539e0e5902b
-size 5889956
+oid sha256:06fc8a2c0da94c377a45b03de881edc20302235b3061e6c11c644f759e0ea6b5
+size 4219756
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 27eb516..8ec8ebc 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bb235cc5f9f4d00ea874e02eb4c341e58a47ffd795b9ee5868b526fdd6ebd1a
-size 5872380
+oid sha256:6afee041e2f161c6bf1492ef88b07ab364d6081d506a5ff9cdd75f74da093470
+size 4219028