From 764a568e0d21a010025d424eac6b5ba038b366ca3e4da3e50f5e29e3057d3a26 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 31 May 2024 20:37:45 +0000 Subject: [PATCH 1/3] Accepting request 1177755 from home:mcalabkova:branches:devel:languages:python - Update to 6.0 * Add support for Python 3.12. * Drop support for Python 2.7, 3.5, 3.6. * Fix sorting issue in scripts/space.py. * FileStorage: fix a rare data corruption when using restore after multiple undos. * Fix exit code of repozo script in case of verification error. OBS-URL: https://build.opensuse.org/request/show/1177755 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZODB?expand=0&rev=28 --- ZODB-5.8.1.tar.gz | 3 --- ZODB-6.0.tar.gz | 3 +++ python-ZODB.changes | 10 ++++++++++ python-ZODB.spec | 7 ++----- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 ZODB-5.8.1.tar.gz create mode 100644 ZODB-6.0.tar.gz diff --git a/ZODB-5.8.1.tar.gz b/ZODB-5.8.1.tar.gz deleted file mode 100644 index 45606a9..0000000 --- a/ZODB-5.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6c73abd3660d606ffc1f21f97def14b52b46f4a702ec9e6ee449a6e2be264df -size 790095 diff --git a/ZODB-6.0.tar.gz b/ZODB-6.0.tar.gz new file mode 100644 index 0000000..069e639 --- /dev/null +++ b/ZODB-6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e51c792115c5daad4e806757bafa2f754c000c23e6babc3be5e40775fe49b5dc +size 786862 diff --git a/python-ZODB.changes b/python-ZODB.changes index c77d19c..c561b0c 100644 --- a/python-ZODB.changes +++ b/python-ZODB.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 30 12:34:58 UTC 2024 - Markéta Machová + +- Update to 6.0 + * Add support for Python 3.12. + * Drop support for Python 2.7, 3.5, 3.6. + * Fix sorting issue in scripts/space.py. + * FileStorage: fix a rare data corruption when using restore after multiple undos. + * Fix exit code of repozo script in case of verification error. + ------------------------------------------------------------------- Sun Jan 7 16:42:08 UTC 2024 - Dirk Müller diff --git a/python-ZODB.spec b/python-ZODB.spec index 3c7a94f..5c185fa 100644 --- a/python-ZODB.spec +++ b/python-ZODB.spec @@ -17,9 +17,8 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ZODB -Version: 5.8.1 +Version: 6.0 Release: 0 Summary: Zope Object Database: object database and persistence License: ZPL-2.1 @@ -30,7 +29,6 @@ BuildRequires: %{python_module ZConfig} BuildRequires: %{python_module manuel} BuildRequires: %{python_module persistent-devel >= 4.4.0} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} BuildRequires: %{python_module transaction >= 2.4.0} BuildRequires: %{python_module zc.lockfile} BuildRequires: %{python_module zodbpickle >= 1.0.1} @@ -42,13 +40,12 @@ BuildRequires: python-rpm-macros Requires: python-BTrees >= 4.2.0 Requires: python-ZConfig Requires: python-persistent >= 4.4.0 -Requires: python-six Requires: python-transaction >= 2.4.0 Requires: python-zc.lockfile Requires: python-zodbpickle >= 1.0.1 Requires: python-zope.interface Requires(post): update-alternatives -Requires(preun):update-alternatives +Requires(preun): update-alternatives BuildArch: noarch %python_subpackages From ae3ba723c3ad9caa1a7b9a390042697fc590ab14a019866e9529f898bb63472f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 1 Jun 2024 11:53:28 +0000 Subject: [PATCH 2/3] - Fix deduplication of documentation. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZODB?expand=0&rev=29 --- python-ZODB.changes | 1 + python-ZODB.spec | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/python-ZODB.changes b/python-ZODB.changes index c561b0c..691fdb2 100644 --- a/python-ZODB.changes +++ b/python-ZODB.changes @@ -7,6 +7,7 @@ Thu May 30 12:34:58 UTC 2024 - Markéta Machová * Fix sorting issue in scripts/space.py. * FileStorage: fix a rare data corruption when using restore after multiple undos. * Fix exit code of repozo script in case of verification error. +- Fix deduplication of documentation. ------------------------------------------------------------------- Sun Jan 7 16:42:08 UTC 2024 - Dirk Müller diff --git a/python-ZODB.spec b/python-ZODB.spec index 5c185fa..8164aa1 100644 --- a/python-ZODB.spec +++ b/python-ZODB.spec @@ -86,6 +86,10 @@ rm -f src/ZODB/tests/testdocumentation.py %python_clone -a %{buildroot}%{_bindir}/fstail %python_clone -a %{buildroot}%{_bindir}/repozo +mkdir -p %{buildroot}%{_defaultdocdir}/python-ZODB-doc/docs +cp -r docs/* %{buildroot}%{_defaultdocdir}/python-ZODB-doc/docs/ +%fdupes %{buildroot}%{_defaultdocdir}/python-ZODB-doc + %check %python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} zope-testrunner-%{$python_bin_suffix} --test-path=src @@ -107,6 +111,7 @@ rm -f src/ZODB/tests/testdocumentation.py %python_alternative %{_bindir}/repozo %files -n %{name}-doc -%doc docs/ +%dir %{_defaultdocdir}/python-ZODB-doc +%doc %{_defaultdocdir}/python-ZODB-doc/docs %changelog From 5ccf143fbaebd82a6f847ff8770afa8c1f0bb13fa581af571c4443dc809dbe5d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 1 Jun 2024 20:56:19 +0000 Subject: [PATCH 3/3] Simplify %%files list. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZODB?expand=0&rev=30 --- python-ZODB.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-ZODB.spec b/python-ZODB.spec index 8164aa1..0b0bfdc 100644 --- a/python-ZODB.spec +++ b/python-ZODB.spec @@ -111,7 +111,6 @@ cp -r docs/* %{buildroot}%{_defaultdocdir}/python-ZODB-doc/docs/ %python_alternative %{_bindir}/repozo %files -n %{name}-doc -%dir %{_defaultdocdir}/python-ZODB-doc -%doc %{_defaultdocdir}/python-ZODB-doc/docs +%doc %{_defaultdocdir}/python-ZODB-doc %changelog