From 1c2f5c5a7cc81e12603a7e9f1b32108ec78209e87bb4ccf8febfda64733b33ff Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 31 Oct 2023 08:20:05 +0000 Subject: [PATCH 1/6] req module OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=95 --- b4.changes | 6 ++++++ b4.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/b4.changes b/b4.changes index 3836ccb..746c226 100644 --- a/b4.changes +++ b/b4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 31 08:14:02 UTC 2023 - Jiri Slaby + +- add %{python_module ...} also to requires, otherwise bad + requires are generated + ------------------------------------------------------------------- Tue Oct 24 07:57:32 UTC 2023 - Jiri Slaby diff --git a/b4.spec b/b4.spec index 92989f5..24d24fd 100644 --- a/b4.spec +++ b/b4.spec @@ -36,12 +36,12 @@ BuildRequires: fdupes BuildRequires: git-core BuildRequires: git-filter-repo >= 2.30 BuildRequires: python-rpm-macros +Requires: %{python_module dkimpy} +Requires: %{python_module dnspython} +Requires: %{python_module patatt} +Requires: %{python_module requests} Requires: git-core Requires: git-filter-repo >= 2.30 -Requires: python3-dkimpy -Requires: python3-dnspython -Requires: python3-patatt -Requires: python3-requests BuildArch: noarch %description From 1975c686651fed95a931a945a603f17fc000bfab0ea1b2937cd2b29e36dd2cb5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 7 Nov 2023 11:05:46 +0000 Subject: [PATCH 2/6] - correct last change. Requires should have the unversioned python- prefix OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=96 --- b4.changes | 6 ++++++ b4.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/b4.changes b/b4.changes index 746c226..b87c4f6 100644 --- a/b4.changes +++ b/b4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 7 11:05:30 UTC 2023 - Dirk Müller + +- correct last change. Requires should have the unversioned + python- prefix + ------------------------------------------------------------------- Tue Oct 31 08:14:02 UTC 2023 - Jiri Slaby diff --git a/b4.spec b/b4.spec index 24d24fd..aba10ac 100644 --- a/b4.spec +++ b/b4.spec @@ -36,12 +36,12 @@ BuildRequires: fdupes BuildRequires: git-core BuildRequires: git-filter-repo >= 2.30 BuildRequires: python-rpm-macros -Requires: %{python_module dkimpy} -Requires: %{python_module dnspython} -Requires: %{python_module patatt} -Requires: %{python_module requests} Requires: git-core Requires: git-filter-repo >= 2.30 +Requires: python-dkimpy +Requires: python-dnspython +Requires: python-patatt +Requires: python-requests BuildArch: noarch %description From 8a1dcb5a4a3ad7a644b1f48b54dc30bf63528835c7de0d8bf2d3c5c59f745cdf Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 7 Nov 2023 11:36:10 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=97 --- b4.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/b4.spec b/b4.spec index aba10ac..66ec8b0 100644 --- a/b4.spec +++ b/b4.spec @@ -43,6 +43,7 @@ Requires: python-dnspython Requires: python-patatt Requires: python-requests BuildArch: noarch +%{python_subpackages} %description This is a helper utility to work with patches made available via a @@ -79,7 +80,7 @@ test "$THEIRS" = "$OURS" %{buildroot}/%{_bindir}/b4 --help | grep -q 'mbox,am,shazam,pr' %{buildroot}/%{_bindir}/b4 mbox abc |& grep -q 'Grabbing thread from lore.kernel.org/all/abc/t.mbox.gz' -%files +%files %{python_files} %doc README.rst %license COPYING %{_bindir}/%{name} From 03bd9b7d2d913700348d47e65d9c6035d24bcdb9f3f3332deddca33da734fe79 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 7 Nov 2023 11:37:38 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=98 --- b4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/b4.spec b/b4.spec index 66ec8b0..02e76dc 100644 --- a/b4.spec +++ b/b4.spec @@ -16,8 +16,11 @@ # -%define pythons python3 +%if 0%{suse_version} >= 1600 +%global pythons python3 +%else %{?sle15_python_module_pythons} +%endif Name: b4 Version: 0.12.4 Release: 0 From 233b50533eb0a458d722d696cbc59102142a62a78923bdcfa76e598e930d8751 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 7 Nov 2023 16:08:03 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=99 --- b4.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/b4.spec b/b4.spec index 02e76dc..563ba2b 100644 --- a/b4.spec +++ b/b4.spec @@ -18,8 +18,10 @@ %if 0%{suse_version} >= 1600 %global pythons python3 +%global pprefix python3 %else %{?sle15_python_module_pythons} +%global pprefix python311 %endif Name: b4 Version: 0.12.4 @@ -39,14 +41,13 @@ BuildRequires: fdupes BuildRequires: git-core BuildRequires: git-filter-repo >= 2.30 BuildRequires: python-rpm-macros +Requires: %{pprefix}-dkimpy +Requires: %{pprefix}-dnspython +Requires: %{pprefix}-patatt +Requires: %{pprefix}-requests Requires: git-core Requires: git-filter-repo >= 2.30 -Requires: python-dkimpy -Requires: python-dnspython -Requires: python-patatt -Requires: python-requests BuildArch: noarch -%{python_subpackages} %description This is a helper utility to work with patches made available via a @@ -83,7 +84,7 @@ test "$THEIRS" = "$OURS" %{buildroot}/%{_bindir}/b4 --help | grep -q 'mbox,am,shazam,pr' %{buildroot}/%{_bindir}/b4 mbox abc |& grep -q 'Grabbing thread from lore.kernel.org/all/abc/t.mbox.gz' -%files %{python_files} +%files %doc README.rst %license COPYING %{_bindir}/%{name} From 3bf59da21d8e52eb42fe64368ca7db5b944aeef57d90b1e7c2ac71f8e470ffd4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 7 Nov 2023 16:08:36 +0000 Subject: [PATCH 6/6] - remove python_module from requires, this might lead to unwanted side effects. use pprefix macro instead to manage sle15 OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=100 --- b4.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b4.changes b/b4.changes index b87c4f6..6b15d68 100644 --- a/b4.changes +++ b/b4.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Tue Nov 7 11:05:30 UTC 2023 - Dirk Müller -- correct last change. Requires should have the unversioned - python- prefix +- remove python_module from requires, this might lead to unwanted + side effects. use pprefix macro instead to manage sle15 ------------------------------------------------------------------- Tue Oct 31 08:14:02 UTC 2023 - Jiri Slaby