diff --git a/.gitignore b/.gitignore index 413a1f2..980b1c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/pybugz-0.10-git683dd.tar.gz +/pybugz-*.tar.gz diff --git a/pybugz-0.10-git683dd-rh-specific.patch b/pybugz-0.10-git683dd-rh-specific.patch deleted file mode 100644 index e3db0d0..0000000 --- a/pybugz-0.10-git683dd-rh-specific.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/bugz/cli.py b/bugz/cli.py -index aa45d3b..12e2224 100644 ---- a/bugz/cli.py -+++ b/bugz/cli.py -@@ -240,7 +240,10 @@ class PrettyBugz: - log_info(log_msg) - - if not 'status' in params.keys(): -- params['status'] = ['CONFIRMED', 'IN_PROGRESS', 'UNCONFIRMED'] -+ params['status'] = ['CONFIRMED', 'IN_PROGRESS', -+ 'UNCONFIRMED', 'NEW', 'ASSIGNED', 'ON_DEV', -+ 'POST', 'MODIFIED', 'ON_QA', 'VERIFIED', -+ 'RELEASE_PENDING'] - elif 'ALL' in params['status']: - del params['status'] - -diff --git a/bugzrc.example b/bugzrc.example -index f516bf0..e8e1234 100644 ---- a/bugzrc.example -+++ b/bugzrc.example -@@ -59,3 +59,20 @@ - # - # All parameters listed above can be used in the default section if you - # only use one bugzilla installation. -+ -+[gentoo] -+base: https://bugs.gentoo.org/xmlrpc.cgi -+columns: 80 -+encoding: utf-8 -+# user: myname@my.project.com -+# password: secret2 -+ -+[redhat] -+base: https://bugzilla.redhat.com/xmlrpc.cgi -+columns: 80 -+encoding: utf-8 -+# user: myname@my.project.com -+# password: secret2 -+ -+[default] -+connection: redhat -diff --git a/man/bugz.1 b/man/bugz.1 -index 5a88494..365ab7e 100644 ---- a/man/bugz.1 -+++ b/man/bugz.1 -@@ -28,6 +28,12 @@ This man page is a stub; the bugz program has extensive built in help. - will show the help for the global options and - .B bugz [subcommand] -h - will show the help for a specific subcommand. -+.SH CONFIGURATION -+PyBugz is still configured just using the ~/.bugzrc file. For simple template -+look at the bugzrc.example -+.B (rpm -qd pybugz | grep example) -+- you may copy it directly into your home directory to make PyBugz work by -+default with Red Hat bugzilla. - .SH BUGS - .PP - The home page of this project is http://www.github.com/williamh/pybugz. diff --git a/pybugz-0.13-gitbb0ae-limit-configurable.patch b/pybugz-0.13-gitbb0ae-limit-configurable.patch new file mode 100644 index 0000000..32408ff --- /dev/null +++ b/pybugz-0.13-gitbb0ae-limit-configurable.patch @@ -0,0 +1,52 @@ +From 0bd2517f92874c758ec30177c5df4ecdf222236b Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Fri, 3 Dec 2021 13:41:53 +0100 +Subject: [PATCH] Query limit to be configurable + +Red Hat Bugzilla applied policy that anonymous queries can get at most +20 lines in the API output, and authenticated queries up to 1000. + +So it is probably a good idea to "push" Red Hat maintainers to the +authentication (interactive=True) a little bit more and set some +reasonable default limit (limit=1000), otherwise the output will be very +limited (and there's a risk that user misses some bugs thinking that the +output is complete). + +Both of those options can be changed in $HOME/.bugzrc. + +Proposed: +https://github.com/williamh/pybugz/pull/111 +--- + bugz/settings.py | 5 +++++ + pybugz.d/redhat.conf | 2 ++ + 2 files changed, 7 insertions(+) + +diff --git a/bugz/settings.py b/bugz/settings.py +index c45481c..1666f38 100644 +--- a/bugz/settings.py ++++ b/bugz/settings.py +@@ -123,6 +123,11 @@ class Settings: + else: + self.insecure = False + ++ if not hasattr(self, 'limit'): ++ if config.has_option(self.connection, 'limit'): ++ self.limit = get_config_option(config.get, self.connection, ++ 'limit') ++ + if getattr(self, 'encoding', None) is not None: + log_info('The encoding option is deprecated.') + +diff --git a/pybugz.d/redhat.conf b/pybugz.d/redhat.conf +index 36712a5..ec9d293 100644 +--- a/pybugz.d/redhat.conf ++++ b/pybugz.d/redhat.conf +@@ -1,3 +1,5 @@ + [RedHat] + base = https://bugzilla.redhat.com/xmlrpc.cgi + search_statuses = NEW, ASSIGNED, MODIFIED, ON_DEV, POST ++interactive = True ++limit = 1000 +-- +2.33.1 + diff --git a/pybugz-0.13-gitbb0ae-rh-default.patch b/pybugz-0.13-gitbb0ae-rh-default.patch new file mode 100644 index 0000000..ac1321d --- /dev/null +++ b/pybugz-0.13-gitbb0ae-rh-default.patch @@ -0,0 +1,8 @@ +diff --git a/pybugz.d/default.conf b/pybugz.d/default.conf +index cef06b8..32bdd41 100644 +--- a/pybugz.d/default.conf ++++ b/pybugz.d/default.conf +@@ -1,2 +1,2 @@ + [default] +-connection = Gentoo ++connection = RedHat diff --git a/pybugz.spec b/pybugz.spec index 145c240..54fdbc9 100644 --- a/pybugz.spec +++ b/pybugz.spec @@ -1,18 +1,22 @@ -%global gitrev 683dd +%global gitrev bb0ae %global posttag git%{gitrev} %global snapshot %{version}-%{posttag} Name: pybugz Summary: Command line interface for Bugzilla written in Python -Version: 0.10 -Release: 4.%{posttag}%{?dist} -Group: Applications/Communications -License: GPLv2 +Version: 0.13 +Release: 17.%{posttag}%{?dist} +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://github.com/williamh/pybugz BuildArch: noarch -Requires: python2 -BuildRequires: python2-devel +Requires: python3 +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +Patch0: pybugz-0.13-gitbb0ae-rh-default.patch +Patch1: pybugz-0.13-gitbb0ae-limit-configurable.patch %if ! 0%{?rhel} # no bash-completion for RHEL @@ -28,10 +32,6 @@ BuildRequires: bash-completion pkgconfig # script (in dist-git). Source0: %{name}-%{snapshot}.tar.gz -# make the installation better useful for bugzilla.redhat.com users -# ~> downstream -Patch0: %{name}-0.10-git683dd-rh-specific.patch - %description Pybugz was conceived as a tool to speed up the work-flow for Gentoo Linux contributors when dealing with bugs using Bugzilla. By avoiding the clunky web @@ -39,16 +39,18 @@ interface, the user can search, isolate and contribute to the project very quickly. Developers alike can easily extract attachments and close bugs comfortably from the command line. + %prep -%setup -q -n %{name}-%{snapshot} -%patch0 -p1 -b .rh-specific +%autosetup -p1 -n %{name}-%{snapshot} + %build -%{__python} setup.py build +%{__python3} setup.py build + %install # default install process -%{__python} setup.py install --root=%{buildroot} +%{__python3} setup.py install --root=%{buildroot} %global bash_cmpl_dir %(pkg-config --variable=completionsdir bash-completion) %if 0%{?bash_completion} @@ -59,22 +61,151 @@ comfortably from the command line. %endif mkdir -p %{buildroot}%{_mandir}/man1 -mv man/bugz.1 %{buildroot}%{_mandir}/man1/bugz.1 +cp man/bugz.1 %{buildroot}%{_mandir}/man1/bugz.1 mkdir -p %{buildroot}%{_docdir} -%clean %files %{_bindir}/bugz -%{python_sitelib}/bugz +%{python3_sitelib}/bugz %if 0%{?bash_completion} %{bash_cmpl_dir}/bugz %endif -%{python_sitelib}/%{name}-*.egg-info +%{python3_sitelib}/%{name}-*.egg-info %{_mandir}/man1/bugz.1.gz -%doc README LICENSE bugzrc.example +%{_datadir}/pybugz.d/ +%{_mandir}/man5/* +%doc README LICENSE + %changelog +* Fri Sep 19 2025 Python Maint - 0.13-17.gitbb0ae +- Rebuilt for Python 3.14.0rc3 bytecode + +* Fri Aug 15 2025 Python Maint - 0.13-16.gitbb0ae +- Rebuilt for Python 3.14.0rc2 bytecode + +* Fri Jul 25 2025 Fedora Release Engineering - 0.13-15.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 02 2025 Python Maint - 0.13-14.gitbb0ae +- Rebuilt for Python 3.14 + +* Sat Jan 18 2025 Fedora Release Engineering - 0.13-13.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Jul 29 2024 Miroslav Suchý - 0.13-12.gitbb0ae +- convert license to SPDX + +* Fri Jul 19 2024 Fedora Release Engineering - 0.13-11.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 0.13-10.gitbb0ae +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 0.13-9.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.13-8.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 0.13-7.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.13-6.gitbb0ae +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 0.13-5.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.13-4.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.13-3.gitbb0ae +- Rebuilt for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 0.13-2.gitbb0ae +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Dec 03 2021 Pavel Raiskup - 0.13-1.gitbb0ae +- rebase to the latest git HEAD +- allow 'limit: ' configuration, and set limit=1000 for the Red Hat Bugzilla instance + +* Fri Jul 23 2021 Fedora Release Engineering - 0.11-23.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.11-22.git3459d +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.11-21.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.11-20.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.11-19.git3459d +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 0.11-18.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 0.11-17.git3459d +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 0.11-16.git3459d +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.11-15.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.11-14.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.11-13.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 0.11-12.git3459d +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 0.11-11.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.11-10.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.11-9.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 0.11-8.git3459d +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.11-7.git3459d +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 0.11-6.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Dec 03 2015 Pavel Raiskup - 0.11-5.git3459d +- fix rpmbuild --short-circuit + +* Tue Nov 10 2015 Fedora Release Engineering - 0.11-4.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Mon Oct 19 2015 Pavel Raiskup - 0.11-3.git3459d +- setup default connection to 'RedHat' + +* Thu Jun 18 2015 Fedora Release Engineering - 0.11-2.git3459d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Dec 18 2014 Pavel Raiskup - 0.11-1.git3459d +- rebase to recent git HEAD pybugz version + +* Sat Jun 07 2014 Fedora Release Engineering - 0.10-6.git683dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.10-5.git683dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Mar 13 2013 Pavel Raiskup - 0.10-4.git683dd - fix the macro problem for epel diff --git a/sources b/sources index 5d175a3..4984a94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bc25cc5d117e6e6a4801dcf8089c8a6 pybugz-0.10-git683dd.tar.gz +SHA512 (pybugz-0.13-gitbb0ae.tar.gz) = cca9c875f747d2a5153ee79aee68d7c83fc86a25f31ae035ca7c11f74fa4fe7a5df57562fedb5447d126d0747762b7af4bd33fdf54d0c6fe9cd08893a3261383