Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-HyperKitty for
openSUSE:Factory checked in at 2024-03-04 21:24:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-HyperKitty (Old)
and /work/SRC/openSUSE:Factory/.python-HyperKitty.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-HyperKitty"
Mon Mar 4 21:24:40 2024 rev:26 rq:1154168 version:1.3.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-HyperKitty/python-HyperKitty.changes
2024-02-28 19:48:06.483966938 +0100
+++
/work/SRC/openSUSE:Factory/.python-HyperKitty.new.1770/python-HyperKitty.changes
2024-03-04 21:24:41.461426733 +0100
@@ -1,0 +2,8 @@
+Thu Feb 29 19:57:33 UTC 2024 - Ben Greiner <[email protected]>
+
+- Simplify python flavor selection
+ * Go back to primary python3 on Tumbleweed
+ * Use SLE15 python module pythons on 15.x
+- Build PEP517 wheel
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-HyperKitty.spec ++++++
--- /var/tmp/diff_new_pack.PwXnTh/_old 2024-03-04 21:24:42.197453441 +0100
+++ /var/tmp/diff_new_pack.PwXnTh/_new 2024-03-04 21:24:42.201453586 +0100
@@ -37,7 +37,6 @@
%global flufl_lock_min_version 4.0
%global django_q_min_version 1.0.0
-%{?sle15_python_module_pythons}
%global webapps_dir /srv/www/webapps
%global hyperkitty_pkgname HyperKitty
@@ -54,28 +53,17 @@
%global hyperkitty_services hyperkitty-qcluster.service
hyperkitty-runjob-daily.service hyperkitty-runjob-daily.timer
hyperkitty-runjob-hourly.service hyperkitty-runjob-hourly.timer
hyperkitty-runjob-minutely.service hyperkitty-runjob-minutely.timer
hyperkitty-runjob-monthly.service hyperkitty-runjob-monthly.timer
hyperkitty-runjob-quarter-hourly.service hyperkitty-runjob-quarter-hourly.timer
hyperkitty-runjob-weekly.service hyperkitty-runjob-weekly.timer
hyperkitty-runjob-yearly.service hyperkitty-runjob-yearly.timer
-# keep in sync with python-mailman/python-mailman-web/python-postorious
-%if 0%{?suse_version} >= 1600
-# Newest python supported by mailman is Python 3.12, but we have just Python
3.11 in SLE
-# See
https://gitlab.com/mailman/mailman/-/blob/master/src/mailman/docs/NEWS.rst
-%define pythons python312
-%define mypython python312
-%define mypython_sitelib %{python312_sitelib}
-%define __mypython %{__python312}
-%else
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
-%define pythons python311
-%define mypython python311
-%define mypython_sitelib %{python311_sitelib}
-%define __mypython %{__python311}
-%else
-%{?!python_module:%define python_module() python3-%{**}}
+# keep in sync with python-postorius/python-mailman-web
+# Always only build one flavor: primary python for TW, python311 from the
SLE15 python module for 15.x
+%if 0%{?suse_version} >= 1550
%define pythons python3
-%define mypython python3
-%define mypython_sitelib %{python3_sitelib}
-%define __mypython %{__python3}
-%endif
+%else
+%{?sle15_python_module_pythons}
%endif
+%global mypython %pythons
+%global mypython_sitelib %{expand:%%{%{mypython}_sitelib}}
+%global __mypython %{expand:%%{__%{mypython}}}
+%define plainpython python
Name: python-HyperKitty
Version: 1.3.8
@@ -116,7 +104,9 @@
BuildRequires: %{python_module isort}
BuildRequires: %{python_module mailmanclient >= %{mailmanclient_min_version}}
BuildRequires: %{python_module mistune >= %{mistune_min_version}}
+BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module wheel}
BuildRequires: %{python_module xapian-haystack >= 2.1.0}
BuildRequires: acl
BuildRequires: fdupes
@@ -172,10 +162,10 @@
Requires: %{mypython}-pytz >= %{pytz_min_version}
Requires: %{mypython}-robot-detection >= %{robot_detection_min_version}
Requires: %{mypython}-xapian-haystack >= %{django_haystack_min_version}
-%if "%{expand:%%%{mypython}_provides}" == "python3"
-Provides: python3-%{hyperkitty_pkgname} = %{version}-%{release}
-%endif
+# help in replacing any previously installed flavor package back to the
unprefixed package
+%if 0%{?suse_version} < 1550
Obsoletes: python3-%{hyperkitty_pkgname} < %{version}-%{release}
+%endif
Provides: %{mypython}-%{hyperkitty_pkgname} = %{version}-%{release}
Obsoletes: %{mypython}-%{hyperkitty_pkgname} < %{version}-%{release}
%if 0%{?suse_version} >= 1550
@@ -241,7 +231,7 @@
sed -i 's|/usr/bin/python3|%{__mypython}|' %{SOURCE10} %{SOURCE20} %{SOURCE21}
sed -i 's|python3|%{mypython}|' %{SOURCE12}
-%python_build
+%pyproject_wheel
# Build static files
export PYTHONPATH=$(pwd)
@@ -265,7 +255,7 @@
%{buildroot}%{hyperkitty_staticdir}/CACHE \
%{buildroot}%{_unitdir}
-%python_install
+%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
# Copy static files
