commit bmap-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bmap-tools for openSUSE:Factory
checked in at 2024-04-18 22:12:08
Comparing /work/SRC/openSUSE:Factory/bmap-tools (Old)
and /work/SRC/openSUSE:Factory/.bmap-tools.new.26366 (New)
Package is "bmap-tools"
Thu Apr 18 22:12:08 2024 rev:4 rq:1168628 version:3.7
Changes:
--- /work/SRC/openSUSE:Factory/bmap-tools/bmap-tools.changes2024-03-13
22:19:49.535029387 +0100
+++ /work/SRC/openSUSE:Factory/.bmap-tools.new.26366/bmap-tools.changes
2024-04-18 22:13:12.458807756 +0200
@@ -1,0 +2,7 @@
+Tue Apr 16 10:59:14 UTC 2024 - Max Lin
+
+- Add %{?sle15_python_module_pythons} to build with python 3.11 on Leap15
+- Disable gpg test on Leap 15 since python 3.11 build of gpg is not
+ available on Leap 15
+
+---
Other differences:
--
++ bmap-tools.spec ++
--- /var/tmp/diff_new_pack.dww8Ry/_old 2024-04-18 22:13:13.910861148 +0200
+++ /var/tmp/diff_new_pack.dww8Ry/_new 2024-04-18 22:13:13.914861296 +0200
@@ -15,7 +15,13 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
+# The implementation of python 3.11 support begins from SLE15-SP4
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150300
+%bcond_with gpgtest
+%else
+%bcond_without gpgtest
+%endif
+%{?sle15_python_module_pythons}
%define distversion 3.7.0
Name: bmap-tools
Version:3.7
@@ -35,7 +41,9 @@
Requires(postun): update-alternatives
Provides: python-bmaptools = %{version}-%{release}
# SECTION test
+%if %{with gpgtest}
BuildRequires: %{python_module gpg}
+%endif
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module six}
# /SECTION
@@ -78,6 +86,7 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}/
%check
+%if %{with gpgtest}
# extend signing key expiration for reproducible builds
export GNUPGHOME=$PWD/tests/test-data/gnupg
echo 'expire
@@ -88,6 +97,10 @@
save' | gpg --command-fd=0 --batch --edit-key
927FF9746434704C5774BE648D49DFB1163BDFB4
# no /sys/module/zfs/ in obs test environment: returns false instead of IOError
%pytest -k "not test_is_zfs_configuration_compatible_unreadable_file"
+%else
+# there is no gpg built with python 3.11 in Leap15/SLE15
+%pytest -k "not test_is_zfs_configuration_compatible_unreadable_file and not
test_valid_signature"
+%endif
%post
%{python_install_alternative bmaptool bmaptool.1}
commit bmap-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bmap-tools for openSUSE:Factory
checked in at 2024-03-13 22:18:45
Comparing /work/SRC/openSUSE:Factory/bmap-tools (Old)
and /work/SRC/openSUSE:Factory/.bmap-tools.new.1770 (New)
Package is "bmap-tools"
Wed Mar 13 22:18:45 2024 rev:3 rq:1157284 version:3.7
Changes:
--- /work/SRC/openSUSE:Factory/bmap-tools/bmap-tools.changes2022-11-21
15:29:57.192757230 +0100
+++ /work/SRC/openSUSE:Factory/.bmap-tools.new.1770/bmap-tools.changes
2024-03-13 22:19:49.535029387 +0100
@@ -1,0 +2,13 @@
+Fri Mar 8 14:47:36 UTC 2024 - Ben Greiner
+
+- Update to 3.7
+ * Add functionality for copying from standard input (#99)
+ * Switch from gpg to gpgme module (#103)
+- New upstream maintainer: yoctoproject
+- Drop bmap-tools-pr103-replace-python-gpgme.patch
+- Drop bmap-tools-3.6-suse-fix-tests.patch
+- Work around reproducible build failure by extending the testing
+ gnupg key
+ * boo#1221108 gh#intel/bmap-tools#116 gh#yoctoproject/bmaptool#1
+
+---
Old:
bmap-tools-3.6-suse-fix-tests.patch
bmap-tools-3.6.tar.gz
bmap-tools-pr103-replace-python-gpgme.patch
pubring.kbx
random_seed
test.image.bmap.v2.0.sig-by-wrong-key
test.image.bmap.v2.0.valid-sig
trustdb.gpg
New:
bmaptool-3.7-gh.tar.gz
BETA DEBUG BEGIN:
Old:- Drop bmap-tools-pr103-replace-python-gpgme.patch
- Drop bmap-tools-3.6-suse-fix-tests.patch
- Work around reproducible build failure by extending the testing
Old:- New upstream maintainer: yoctoproject
- Drop bmap-tools-pr103-replace-python-gpgme.patch
- Drop bmap-tools-3.6-suse-fix-tests.patch
BETA DEBUG END:
Other differences:
--
++ bmap-tools.spec ++
--- /var/tmp/diff_new_pack.7M0VKL/_old 2024-03-13 22:19:50.051048410 +0100
+++ /var/tmp/diff_new_pack.7M0VKL/_new 2024-03-13 22:19:50.051048410 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bmap-tools
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,31 +16,24 @@
#
-%define skip_python2 1
+%define distversion 3.7.0
Name: bmap-tools
-Version:3.6
+Version:3.7
Release:0
Summary:Tools to generate block map (AKA bmap) and flash images using
bmap
License:GPL-2.0-only
Group: Development/Tools/Other
-URL:https://github.com/intel/bmap-tools
-Source0:
https://github.com/intel/bmap-tools/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# For Patch0
-Source11:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/gnupg/pubring.kbx
-Source12:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/gnupg/random_seed
-Source13:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/gnupg/trustdb.gpg
-Source14:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/test.image.bmap.v2.0.sig-by-wrong-key
-Source15:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/test.image.bmap.v2.0.valid-sig
-# PATCH-FEATURE-UPSTREAM bmap-tools-pr103-replace-python-gpgme.patch
gh#intel/bmap-tools#103 + gh#intel/bmap-tools#112
-Patch0: bmap-tools-pr103-replace-python-gpgme.patch
-# PATCH-FIX-OPENSUSE remove-backports.tempfile.patch c...@bnavigator.de -- no
need to support Python < 3.2
-Patch1: bmap-tools-3.6-suse-fix-tests.patch
-BuildRequires: %{python_module setuptools}
+URL:https://github.com/yoctoproject/bmaptool
+Source0:
https://github.com/yoctoproject/bmaptool/archive/refs/tags/v%{version}.tar.gz#/bmaptool-%{version}-gh.tar.gz
+BuildRequires: %{python_module pip}
+BuildRequires: %{python_module poetry-core}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-gpg
+Requires: python-gpg >= 1.10
+Requires: python-six >= 1.15
Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
+Provides: python-bmaptools = %{version}-%{release}
# SECTION test
BuildRequires: %{python_module gpg}
BuildRequires: %{python_module pytest}
@@ -66,37 +59,33 @@
than with traditional tools like "dd" or "cp".
%prep
-%autosetup -p1
-# remove shebang
-tail -n +2 bmaptools/CLI.py > bmaptools/CLI.py_new
-mv bmaptools/CLI.py{_new,}
-%if 0%{?suse_version} < 1550
-# no
commit bmap-tools for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bmap-tools for openSUSE:Factory
checked in at 2022-11-21 15:29:49
Comparing /work/SRC/openSUSE:Factory/bmap-tools (Old)
and /work/SRC/openSUSE:Factory/.bmap-tools.new.1597 (New)
Package is "bmap-tools"
Mon Nov 21 15:29:49 2022 rev:2 rq:1036972 version:3.6
Changes:
--- /work/SRC/openSUSE:Factory/bmap-tools/bmap-tools.changes2021-10-11
15:32:14.298904710 +0200
+++ /work/SRC/openSUSE:Factory/.bmap-tools.new.1597/bmap-tools.changes
2022-11-21 15:29:57.192757230 +0100
@@ -1,0 +2,15 @@
+Fri Nov 18 22:51:34 UTC 2022 - Ben Greiner
+
+- Add bmap-tools-pr103-replace-python-gpgme.patch
+ * gh#intel/bmap-tools#43
+ * gh#intel/bmap-tools#103
+ * Add missing binary test data from the PR which does not fit
+into the patch
+- Enable test suite (with pytest as substitute for nose)
+- Add bmap-tools-3.6-suse-fix-tests.patch
+ * remove backports.tempfile and mock-- no need to support
+Python < 3.2
+ * fix entry-point call
+ * includes part of gh#intel/bmap-tools#112
+
+---
New:
bmap-tools-3.6-suse-fix-tests.patch
bmap-tools-pr103-replace-python-gpgme.patch
pubring.kbx
random_seed
test.image.bmap.v2.0.sig-by-wrong-key
test.image.bmap.v2.0.valid-sig
trustdb.gpg
Other differences:
--
++ bmap-tools.spec ++
--- /var/tmp/diff_new_pack.If9BS7/_old 2022-11-21 15:29:58.108761880 +0100
+++ /var/tmp/diff_new_pack.If9BS7/_new 2022-11-21 15:29:58.112761901 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bmap-tools
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
#
+%define skip_python2 1
Name: bmap-tools
Version:3.6
Release:0
@@ -24,12 +25,27 @@
Group: Development/Tools/Other
URL:https://github.com/intel/bmap-tools
Source0:
https://github.com/intel/bmap-tools/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# For Patch0
+Source11:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/gnupg/pubring.kbx
+Source12:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/gnupg/random_seed
+Source13:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/gnupg/trustdb.gpg
+Source14:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/test.image.bmap.v2.0.sig-by-wrong-key
+Source15:
https://github.com/intel/bmap-tools/raw/ffdcbc752cb086d33f083100b4c2498914a7b8eb/tests/test-data/test.image.bmap.v2.0.valid-sig
+# PATCH-FEATURE-UPSTREAM bmap-tools-pr103-replace-python-gpgme.patch
gh#intel/bmap-tools#103 + gh#intel/bmap-tools#112
+Patch0: bmap-tools-pr103-replace-python-gpgme.patch
+# PATCH-FIX-OPENSUSE remove-backports.tempfile.patch c...@bnavigator.de -- no
need to support Python < 3.2
+Patch1: bmap-tools-3.6-suse-fix-tests.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-gpgme
+Requires: python-gpg
Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
+# SECTION test
+BuildRequires: %{python_module gpg}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module six}
+# /SECTION
Recommends: bzip2
Recommends: gzip
Recommends: lz4
@@ -44,17 +60,25 @@
%python_subpackages
%description
-Tools to generate block map (AKA bmap) and flash images using bmap. Bmaptool is
-a generic tool for creating the block map (bmap) for a file, and copying files
+Bmaptool is a generic tool for creating the block map (bmap) for a file, and
copying files
using the block map. The idea is that large file containing unused blocks, like
raw system image files, can be copied or flashed a lot faster with bmaptool
than with traditional tools like "dd" or "cp".
%prep
-%setup -q
+%autosetup -p1
# remove shebang
tail -n +2 bmaptools/CLI.py > bmaptools/CLI.py_new
mv bmaptools/CLI.py{_new,}
+%if 0%{?suse_version} < 1550
+# no python_flavored_alternatives in old python-rpm-macros
+mkdir testbin
+sed '1{s/env python/python3/}' bmaptool > testbin/bmaptool
+chmod +x testbin/bmaptool
+%endif
+rm __main__.py bmaptool
+cp %{SOURCE11} %{SOURCE12} %{SOURCE13} tests/test-data/gnupg/
+cp %{SOURCE14} %{SOURCE15} tests/test-data/signatures/
%build
