From 3a68d305f55d5f3b3647d669cd66b42d0284de85 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Sun, 28 Nov 2021 23:24:49 +0100
Subject: [PATCH] New upstream release

Resolves: rhbz#2025563
Version: 2-1
---
 argparse-manpage.spec         | 63 +++++++++++++++++++++++++----------
 build-and-update-all-branches |  2 +-
 sources                       |  2 +-
 3 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/argparse-manpage.spec b/argparse-manpage.spec
index a1f374e..0ecd8ee 100644
--- a/argparse-manpage.spec
+++ b/argparse-manpage.spec
@@ -1,11 +1,9 @@
 %if 0%{?fedora}
-  %bcond_without python3
-  %if 0%{?fedora} > 29
-    %bcond_with python2
-  %else
-    %bcond_without python2
-  %endif
+  %bcond_without   pyproject
+  %bcond_with      python2
+  %bcond_with      python3
 %else
+  %bcond_with      pyproject
   %if 0%{?rhel} > 7
     %bcond_with    python2
     %bcond_without python3
@@ -29,32 +27,41 @@ There is a limited support for (deprecated) optparse objects, too.
 
 
 Name:           argparse-manpage
-Version:        1.5
-Release:        4%{?dist}
+Version:        2
+Release:        1%{?dist}
 Summary:        %{sum Python}
 BuildArch:      noarch
 
 License:        ASL 2.0
 URL:            https://github.com/praiskup/%{name}
-Source0:        %pypi_source
+Source0:        https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz
 
 %if %{with python2}
 BuildRequires: python2-setuptools python2-devel
 %if %{with check}
 %if 0%{?rhel} && 0%{?rhel} == 7
-BuildRequires: pytest python-six
+BuildRequires: pytest
 %else
-BuildRequires: python2-pytest python2-six
+BuildRequires: python2-pytest
 %endif
 %endif
 %endif
+
 %if %{with python3}
 BuildRequires: python3-setuptools python3-devel
 %if %{with check}
-BuildRequires: python3-pytest python3-six
+BuildRequires: python3-pytest
 %endif
 %endif
-%if %{with python3}
+
+%if %{with pyproject}
+BuildRequires: python3-devel
+%if %{with check}
+BuildRequires: python3-pytest
+%endif
+%endif
+
+%if %{with python3} || %{with pyproject}
 Requires: python3-%name = %version-%release
 %else
 Requires: python2-%name = %version-%release
@@ -81,6 +88,11 @@ Summary:        %{sum Python 3}
 %prep
 %setup -q
 
+%if %{with pyproject}
+%generate_buildrequires
+%pyproject_buildrequires
+%endif
+
 
 %build
 %if %{with python2}
@@ -89,6 +101,9 @@ Summary:        %{sum Python 3}
 %if %{with python3}
 %py3_build
 %endif
+%if %{with pyproject}
+%pyproject_wheel
+%endif
 
 
 %install
@@ -98,16 +113,22 @@ Summary:        %{sum Python 3}
 %if %{with python3}
 %py3_install
 %endif
+%if %{with pyproject}
+%pyproject_install
+%endif
 
 
 
 %if %{with check}
 %check
 %if %{with python2}
-PYTHONPATH=%buildroot%python2_sitearch %__python2 -m pytest
+PYTHONPATH=%buildroot%python2_sitearch %__python2 -m pytest -vv
 %endif
 %if %{with python3}
-PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest
+PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest -vv
+%endif
+%if %{with pyproject}
+%pytest
 %endif
 %endif
 
@@ -116,7 +137,7 @@ PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest
 %license LICENSE
 %{_bindir}/argparse-manpage
 %_mandir/man1/argparse-manpage.1.*
-%if %{with python3}
+%if %{with python3} || %{with pyproject}
 %python3_sitelib/build_manpages/cli
 %else
 %python2_sitelib/build_manpages/cli
@@ -132,16 +153,24 @@ PYTHONPATH=%buildroot%python3_sitearch %__python3 -m pytest
 %endif
 
 
-%if %{with python3}
+%if %{with python3} || %{with pyproject}
 %files -n python3-%name
 %license LICENSE
 %python3_sitelib/build_manpages
+%if %{with pyproject}
+%python3_sitelib/argparse_manpage-*dist-info
+%else
 %python3_sitelib/argparse_manpage-%{version}*.egg-info
+%endif
 %exclude %python3_sitelib/build_manpages/cli
 %endif
 
 
 %changelog
+* Sun Nov 28 2021 Pavel Raiskup <praiskup@redhat.com> - 2-1
+- new upstream release:
+  https://github.com/praiskup/argparse-manpage/releases/tag/v2
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/build-and-update-all-branches b/build-and-update-all-branches
index 9fb7a03..2d9d39d 100755
--- a/build-and-update-all-branches
+++ b/build-and-update-all-branches
@@ -3,7 +3,7 @@
 # Prepare master branch, review the list of branches below and then execute this
 # script.
 
-branches='master epel7 epel8 f32 f33'
+branches='master epel7 epel8 f33 f34 f35'
 
 exit_handler ()
 {
diff --git a/sources b/sources
index 30311cf..d2530bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (argparse-manpage-1.5.tar.gz) = cb3f15679ce944f3dbd641bf724f0715edab3c647dbd1bbd825b8df7657faaa4dee32b91c331c21f180ee68ac2426646bc0ae3593cb16ea6edc702132e5a2010
+SHA512 (argparse-manpage-2.tar.gz) = 24854cd5209635e8938716f97cb4eb283152a2a109c554385a78a5145c6e0f38c76a9172d607fb3ffdf610e8d3f7270ed94f6b4612ce731ea9dafe0a1bebebe6