From 62085ecffd2df97faff7f998218fb963454da88d Mon Sep 17 00:00:00 2001
From: Ondřej Pohořelský <opohorel@redhat.com>
Date: Jul 25 2023 08:39:09 +0000
Subject: Update to 3.3.3


Modernizes specfile, now using automatic buildrequires
Resolves: #2219952, #2133259

---

diff --git a/breezy.spec b/breezy.spec
index 8ed3aa1..b61e081 100644
--- a/breezy.spec
+++ b/breezy.spec
@@ -4,37 +4,32 @@
 #   Version: bzr version, add subrelease version here
 #   bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %).
 #   baserelease: rpm release number (0.N for rc candidates, N for stable releases)
-%global brzmajor 3.2
-%global brzminor .2
+%global brzmajor 3.3
+%global brzminor .3
 #global brzrc b6
-%global baserelease 10
+%global baserelease 1
 
 Name:           breezy
 Version:        %{brzmajor}%{?brzminor}
 Release:        %{baserelease}%{?brzrc:.}%{?brzrc}%{?dist}
 Summary:        Friendly distributed version control system
 
-License:        GPL-2.0-or-later
+# breezy is GPL-2.0-or-later, but it has Rust dependencies
+# see packaged LICENSE.dependencies for details
+License:        GPL-2.0-or-later AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND Apache-2.0 AND MIT AND (Unlicense OR MIT)
 URL:            http://www.breezy-vcs.org/
 Source0:        https://launchpad.net/brz/%{brzmajor}/%{version}%{?brzrc}/+download/%{name}-%{version}%{?brzrc}.tar.gz
 Source1:        https://launchpad.net/brz/%{brzmajor}/%{version}%{?brzrc}/+download/%{name}-%{version}%{?brzrc}.tar.gz.asc
 Source2:        brz-icon-64.png
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-configobj
-BuildRequires:  python3-Cython
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-sphinx-epytext
-BuildRequires:  python3-setuptools
-BuildRequires:  python-fastbencode
+BuildRequires:  rust-packaging >= 21
 BuildRequires:  zlib-devel
 BuildRequires:  bash-completion
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  make
 
-Requires:       python3-paramiko
-
 # This is the name of the command, note that it is brz, not bzr
 Provides:       brz = %{version}-%{release}
 
@@ -59,6 +54,7 @@ By default, Breezy provides support for both the Bazaar and Git file formats.
 
 %package doc
 Summary:        Documentation for Breezy
+License:        GPL-2.0-or-later
 BuildArch:      noarch
 
 %description doc
@@ -67,6 +63,8 @@ This package contains the documentation for the Breezy version control system.
 %prep
 %autosetup -p0 -n %{name}-%{version}%{?brzrc}
 
+%cargo_prep
+
 # Remove unused shebangs
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' \
     breezy/__main__.py \
@@ -80,6 +78,12 @@ sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' \
 # Remove Cython generated .c files
 find . -name '*_pyx.c' -exec rm \{\} \;
 
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+%pyproject_buildrequires -x doc
+
+
 %build
 %py3_build
 
@@ -95,6 +99,8 @@ for dir in *; do
 done
 popd
 
+# Add Rust licenses
+%{cargo_license} > LICENSE.dependencies
 
 %install
 %py3_install
@@ -131,7 +137,7 @@ echo ".so man1/git-remote-brz.1" > %{buildroot}%{_mandir}/man1/git-remote-bzr.1
 
 %files
 # ... -f %%{name}.lang
-%license COPYING.txt
+%license COPYING.txt LICENSE.dependencies
 %doc NEWS README.rst TODO contrib/
 %{_bindir}/brz
 %{_bindir}/bzr-*-pack
@@ -146,11 +152,16 @@ echo ".so man1/git-remote-brz.1" > %{buildroot}%{_mandir}/man1/git-remote-bzr.1
 
 
 %files doc
-%license COPYING.txt
+%license COPYING.txt LICENSE.dependencies
 %doc en developers
 
 
 %changelog
+* Mon Jul 24 2023 Ondrej Pohorelsky <opohorel@redhat.com> - 3.3.3-1
+- Update to 3.3.3
+- Modernizes specfile, now using automatic buildrequires
+- Resolves: #2219952, #2133259
+
 * Sun Jul 23 2023 Python Maint <python-maint@redhat.com> - 3.2.2-10
 - Rebuilt for Python 3.12
 
diff --git a/sources b/sources
index d1c515b..3c511fb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (breezy-3.2.2.tar.gz) = be77beee7b14c5ae0f3fb17c5c45802399b0c8a0b3ccff0c56545a2d7ff70bb2800f6d1bfc2c8047716f439fa3fb6beb9656b9af715021d8d8b222b9498323d7
-SHA512 (breezy-3.2.2.tar.gz.asc) = 1980dc692db2720f98c335a38fef32a43b4b9267b8c7180acda442dce83c05b1199b4d7382f084ca1512ddcfae51a6bf09ec9e236c46292708220613a8accd79
+SHA512 (breezy-3.3.3.tar.gz) = 01b7b7ac6c6e19954ae55b617b7fd1f0cad8b444750e3edc8356320bfa3856ec660ffa8617bcf805525358f6f7281f08196171afa221d6bd4e71a4825dfb77b7
+SHA512 (breezy-3.3.3.tar.gz.asc) = 77b83d64518bee061863b36d46a3bd7ce4d323f3ade456ecb9fb73f3e07cf3aa671d930a61bf4e5dc8928269935d02e4ea31992a86771c93b3f83b608a01889a