From 3c7dfdead37a0fe020a3e4952c0042d3b595869b61cb35c671eac8a8220f1dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 13 May 2025 09:18:32 +0000 Subject: [PATCH 1/2] Accepting request 1277021 from home:mcalabkova:branches:devel:languages:python - Convert to pip-based build OBS-URL: https://build.opensuse.org/request/show/1277021 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZODB?expand=0&rev=32 --- python-ZODB.changes | 5 +++++ python-ZODB.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/python-ZODB.changes b/python-ZODB.changes index 691fdb2..84c0a60 100644 --- a/python-ZODB.changes +++ b/python-ZODB.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 13 06:37:07 UTC 2025 - Markéta Machová + +- Convert to pip-based build + ------------------------------------------------------------------- Thu May 30 12:34:58 UTC 2024 - Markéta Machová diff --git a/python-ZODB.spec b/python-ZODB.spec index 0b0bfdc..d059ab1 100644 --- a/python-ZODB.spec +++ b/python-ZODB.spec @@ -1,7 +1,7 @@ # # spec file for package python-ZODB # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2013 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -28,8 +28,10 @@ BuildRequires: %{python_module BTrees >= 4.2.0} BuildRequires: %{python_module ZConfig} BuildRequires: %{python_module manuel} BuildRequires: %{python_module persistent-devel >= 4.4.0} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module transaction >= 2.4.0} +BuildRequires: %{python_module wheel} BuildRequires: %{python_module zc.lockfile} BuildRequires: %{python_module zodbpickle >= 1.0.1} BuildRequires: %{python_module zope.interface} @@ -44,8 +46,8 @@ 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(post): alts +Requires(preun): alts BuildArch: noarch %python_subpackages @@ -74,10 +76,10 @@ rm -rf src/ZODB.egg-info rm -f src/ZODB/tests/testdocumentation.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/fsdump @@ -103,7 +105,7 @@ cp -r docs/* %{buildroot}%{_defaultdocdir}/python-ZODB-doc/docs/ %license LICENSE.txt COPYRIGHT.txt %doc 3.11.txt CHANGES.rst HISTORY.rst README.rst %{python_sitelib}/ZODB/ -%{python_sitelib}/ZODB-%{version}-py*.egg-info +%{python_sitelib}/[Zz][Oo][Dd][Bb]-%{version}*-info %python_alternative %{_bindir}/fsdump %python_alternative %{_bindir}/fsoids %python_alternative %{_bindir}/fsrefs From ca81e999f14d8eff8122338527dc4d78bbff0f0f3e535326317892cbb416b852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 13 May 2025 12:32:07 +0000 Subject: [PATCH 2/2] Accepting request 1277131 from home:mcalabkova:branches:devel:languages:python - Update to 6.0.1 * repozo: fix restoring on stdout. * repozo: prevent an incorrect "option ignored" warning when running backup or verify. * FileStorage: fix restore regression introduced in ZODB 6.0 in #395: when restoring data records with undo the restore was no longer emitting backpointers and was emitting duplicate data copies instead. #409 fixes restore back to emit data records with backpointers for undo again. - Add conflict with fstail, since ZODB has a binary with the same name. OBS-URL: https://build.opensuse.org/request/show/1277131 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZODB?expand=0&rev=33 --- ZODB-6.0.tar.gz | 3 --- python-ZODB.changes | 14 ++++++++++++++ python-ZODB.spec | 7 ++++--- zodb-6.0.1.tar.gz | 3 +++ 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 ZODB-6.0.tar.gz create mode 100644 zodb-6.0.1.tar.gz diff --git a/ZODB-6.0.tar.gz b/ZODB-6.0.tar.gz deleted file mode 100644 index 069e639..0000000 --- a/ZODB-6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e51c792115c5daad4e806757bafa2f754c000c23e6babc3be5e40775fe49b5dc -size 786862 diff --git a/python-ZODB.changes b/python-ZODB.changes index 84c0a60..d3008cb 100644 --- a/python-ZODB.changes +++ b/python-ZODB.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue May 13 12:06:18 UTC 2025 - Markéta Machová + +- Update to 6.0.1 + * repozo: fix restoring on stdout. + * repozo: prevent an incorrect "option ignored" warning when running + backup or verify. + * FileStorage: fix restore regression introduced in ZODB 6.0 in #395: + when restoring data records with undo the restore was no longer + emitting backpointers and was emitting duplicate data copies instead. + #409 fixes restore back to emit data records with backpointers for + undo again. +- Add conflict with fstail, since ZODB has a binary with the same name. + ------------------------------------------------------------------- Tue May 13 06:37:07 UTC 2025 - Markéta Machová diff --git a/python-ZODB.spec b/python-ZODB.spec index d059ab1..06cb7b3 100644 --- a/python-ZODB.spec +++ b/python-ZODB.spec @@ -18,12 +18,12 @@ Name: python-ZODB -Version: 6.0 +Version: 6.0.1 Release: 0 Summary: Zope Object Database: object database and persistence License: ZPL-2.1 URL: https://github.com/zopefoundation/ZODB -Source: https://files.pythonhosted.org/packages/source/Z/ZODB/ZODB-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/z/zodb/zodb-%{version}.tar.gz BuildRequires: %{python_module BTrees >= 4.2.0} BuildRequires: %{python_module ZConfig} BuildRequires: %{python_module manuel} @@ -48,6 +48,7 @@ Requires: python-zodbpickle >= 1.0.1 Requires: python-zope.interface Requires(post): alts Requires(preun): alts +Conflicts: fstail BuildArch: noarch %python_subpackages @@ -66,7 +67,7 @@ Provides: %{python_module ZODB-doc = %{version}} This package contains documentation files for %{name}. %prep -%setup -q -n ZODB-%{version} +%setup -q -n zodb-%{version} # delete backup files find . -name "*~" -print -delete # remove unwanted shebang diff --git a/zodb-6.0.1.tar.gz b/zodb-6.0.1.tar.gz new file mode 100644 index 0000000..7ccf080 --- /dev/null +++ b/zodb-6.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89f70fae1852123e243547909c311441d63405dec26f6ec42f365a2191db9509 +size 788213