PR#10: Update to 3.2.0 - rpms/breezy

rpms / breezy

#10 Update to 3.2.0

Merged 3 years ago by opohorel. Opened 3 years ago by opohorel.

rpms/ opohorel/breezy breezy-3.2.0 into rawhide

Update to 3.2.0

Ondřej Pohořelský • 3 years ago

15db656

breezy.spec

file modified

+6 -7

		`@@ -4,10 +4,10 @@`
		`# 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.1`
		`+ %global brzmajor 3.2`
		`%global brzminor .0`
		`#global brzrc b6`
		`- %global baserelease 2`
		`+ %global baserelease 1`

		`Name: breezy`
		`Version: %{brzmajor}%{?brzminor}`
		`@@ -20,10 +20,6 @@`
		`Source1: https://launchpad.net/brz/%{brzmajor}/%{version}%{?brzrc}/+download/%{name}-%{version}%{?brzrc}.tar.gz.asc`
		`Source2: brz-icon-64.png`

		`- # Python 3.10 compatibility`
		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1890880`
		`- Patch1: https://launchpadlibrarian.net/507809454/brz-python310.patch`
		`-`
		`BuildRequires: python3-devel`
		`BuildRequires: python3-configobj`
		`BuildRequires: python3-Cython`
		`@@ -34,7 +30,7 @@`
		`BuildRequires: bash-completion`
		`BuildRequires: gcc`
		`BuildRequires: gettext`
		`- BuildRequires: make`
		`+ BuildRequires: make`

		`Requires: python3-paramiko`

		`@@ -154,6 +150,9 @@`


		`%changelog`
		`+ * Wed May 05 2021 Ondrej Pohorelsky <opohorel@redhat.com> - 3.2.0-1`
		`+ - Update to 3.2.0`
		`+`
		`* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`

brz-python310.patch

file removed

-52

		`@@ -1,52 +0,0 @@`
		`- revno: 7526`
		`- committer: Victor Stinner <vstinner@python.org>`
		`- branch nick: brz`
		`- timestamp: Thu 2020-11-19 13:13:38 +0100`
		`- message:`
		`- Port to Python 3.10`
		`-`
		`- Set static tuple reference count using Py_SET_REFCNT() rather than using`
		`- Py_REFCNT().`
		`-`
		`- Define Py_SET_REFCNT() for Python 3.8 and older in python-compat.h.`
		`-`
		`- On Python 3.10, Py_REFCNT() can no longer be used as an l-value to set an`
		`- object reference count: Py_SET_REFCNT() must be used for that.`
		`- See https://bugs.python.org/issue39573 for more details.`
		`-`
		`- Fix issue #1904868.`
		`- diff:`
		`- === modified file 'breezy/_static_tuple_c.c'`
		`- --- breezy/_static_tuple_c.c 2019-11-18 01:30:13 +0000`
		`- +++ breezy/_static_tuple_c.c 2020-11-19 12:13:38 +0000`
		`- @@ -97,7 +97,7 @@`
		`- self->flags \|= STATIC_TUPLE_INTERNED_FLAG;`
		`- // The two references in the dict do not count, so that the StaticTuple`
		`- // object does not become immortal just because it was interned.`
		`- - Py_REFCNT(self) -= 1;`
		`- + Py_SET_REFCNT(self, Py_REFCNT(self) - 1);`
		`- return self;`
		`- }`
		`-`
		`- @@ -116,7 +116,7 @@`
		`-`
		`- if (_StaticTuple_is_interned(self)) {`
		`- /* revive dead object temporarily for Discard */`
		`- - Py_REFCNT(self) = 2;`
		`- + Py_SET_REFCNT(self, 2);`
		`- if (SimpleSet_Discard(_interned_tuples, (PyObject*)self) != 1)`
		`- Py_FatalError("deletion of interned StaticTuple failed");`
		`- self->flags &= ~STATIC_TUPLE_INTERNED_FLAG;`
		`-`
		`- === modified file 'breezy/python-compat.h'`
		`- --- breezy/python-compat.h 2019-03-05 07:56:11 +0000`
		`- +++ breezy/python-compat.h 2020-11-19 12:13:38 +0000`
		`- @@ -119,4 +119,8 @@`
		`- #define strtoull _strtoui64`
		`- #endif`
		`-`
		`- +#if PY_VERSION_HEX < 0x030900A4`
		`- +# define Py_SET_REFCNT(obj, refcnt) ((Py_REFCNT(obj) = (refcnt)), (void)0)`
		`- +#endif`
		`- +`
		`- #endif /* _BZR_PYTHON_COMPAT_H */`

sources

file modified

+2 -2

		`@@ -1,2 +1,2 @@`
		`- SHA512 (breezy-3.1.0.tar.gz) = 40ea1ae364940ac8ff83d3f5da2437cc62fbda0ca98b3ae90a38dfad87555c3993b852ce186323454d7ab002ba4fbb3270e70953504e449c445efe147847204d`
		`- SHA512 (breezy-3.1.0.tar.gz.asc) = 7236addfc6d88d487e590474ae029888e55f9cd8aedf6aec3d311e295b86c5883618be4be7697b76d06d0d2ce720dcde0ec297ca879889ff06db09dee688bfcc`
		`+ SHA512 (breezy-3.2.0.tar.gz) = 980aad231860ea647a28e4e958e3aa1ba6c706781f2a8a3ecd4a5daee436f7d6fecbc4316395f40598d5ed14d9b3aa49f449132cfe70ee3988772d94f51f5dc4`
		`+ SHA512 (breezy-3.2.0.tar.gz.asc) = b0ecf00947bf7d3acdfb4f9ddcd81c428f10f3c7f21f6735fafb559e1adbfd3bbf0be883cc0bdb49dd33ce596c0c6d36aa3adfa38ea7e5f560080f66ec1f3b04`

opohorel commented 3 years ago

Release notes are yet to be published.

Changes can be seen here:
https://bazaar.launchpad.net/~brz/brz/3.2/changes

Dropped Python 3.10 compatibility patch, because it is already merged in upstream.
Added one space in BuildRequires: make line in order to satisfy my OCD.