From 9276e2c7cb8c745841331ac12c065f3588a501a892fc8439b5f9dcf95f12c6da Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 25 Feb 2024 07:06:14 +0000 Subject: [PATCH 1/2] Accepting request 1150049 from home:crameleon:branches:devel:languages:python:mailman Build for Python 3.12 to restore compatibility with Mailman3 OBS-URL: https://build.opensuse.org/request/show/1150049 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-HyperKitty?expand=0&rev=75 --- python-HyperKitty.changes | 5 +++++ python-HyperKitty.spec | 31 ++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/python-HyperKitty.changes b/python-HyperKitty.changes index b961211..6eaad14 100644 --- a/python-HyperKitty.changes +++ b/python-HyperKitty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 23 22:20:00 UTC 2024 - Georg Pfuetzenreuter + +- Build for Python 3.12 + ------------------------------------------------------------------- Mon Nov 6 12:05:07 UTC 2023 - Marcus Rueckert diff --git a/python-HyperKitty.spec b/python-HyperKitty.spec index 4913fd7..929c588 100644 --- a/python-HyperKitty.spec +++ b/python-HyperKitty.spec @@ -1,7 +1,7 @@ # # spec file for package python-HyperKitty # -# Copyright (c) 2023 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %bcond_without testsuite # keep in sync with setup.py @@ -52,19 +53,19 @@ %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-web/python-postorious +# keep in sync with python-mailman/python-mailman-web/python-postorious %if 0%{?suse_version} >= 1550 -# Newest python supported by mailman is Python 3.11 -%define pythons python311 -%define mypython python311 -%define __mypython %{__python311} -%define mypython_sitelib %{python311_sitelib} +# Newest python supported by mailman is Python 3.12 (?) +%define pythons python312 +%define mypython python312 +%define __mypython %{__python312} +%define mypython_sitelib %{python312_sitelib} %else %{?sle15_python_module_pythons} -%define pythons python311 -%define mypython python311 -%define __mypython %{__python311} -%define mypython_sitelib %{python311_sitelib} +%define pythons python312 +%define mypython python312 +%define __mypython %{__python312} +%define mypython_sitelib %{python312_sitelib} %endif Name: python-HyperKitty @@ -93,13 +94,13 @@ Patch0: hyperkitty-settings.patch Patch2: mistune3.patch # # PATCH-FIX-UPSTREAM gl-mr300-add-opengraph-metadata.patch gl#mailman/hyperkitty#300 -Patch98: gl-mr300-add-opengraph-metadata.patch +Patch98: gl-mr300-add-opengraph-metadata.patch # PATCH-FIX-UPSTREAM gl-mr470-introduce-feed-filtering.patch gl#mailman/hyperkitty#470 -Patch99: gl-mr470-introduce-feed-filtering.patch +Patch99: gl-mr470-introduce-feed-filtering.patch # BuildRequires: %{python_module Django >= %{django_min_version} with %python-Django < %{django_max_version}} -BuildRequires: %{python_module django-compressor >= %{django_compressor_min_version}} BuildRequires: %{python_module Whoosh} +BuildRequires: %{python_module django-compressor >= %{django_compressor_min_version}} BuildRequires: %{python_module django-debug-toolbar >= 2.2} BuildRequires: %{python_module django-extensions >= %{django_extensions_min_version}} BuildRequires: %{python_module django-gravatar2 >= %{django_gravatar2_min_version}} @@ -154,7 +155,7 @@ Requires: %{mypython}-django-haystack >= 2.8.0 Requires: %{mypython}-django-mailman3 >= %{django_mailman3_min_version} Requires: %{mypython}-django-q >= %{django_q_min_version} Requires: %{mypython}-djangorestframework >= %{djangorestframework_min_version} -Requires: %{mypython}-flufl.lock >= %{flufl_lock_min_version} +Requires: %{mypython}-flufl.lock >= %{flufl_lock_min_version} Requires: %{mypython}-mailmanclient >= %{mailmanclient_min_version} Requires: %{mypython}-mistune >= %{mistune_min_version} Requires: %{mypython}-networkx >= %{networkx_min_version} From f83a9ec61bf45abd92c14ad1715a5a2275e36764973e5592c82b82eba5a21842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 26 Feb 2024 14:32:22 +0000 Subject: [PATCH 2/2] Accepting request 1150191 from openSUSE:infrastructure:mailman3 - Split out system user (needed for other packages shipping directories/files owned by hyperkitty) and switch to sysusers - Build for Python 3.12 (to restore compatibility with Mailman) OBS-URL: https://build.opensuse.org/request/show/1150191 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-HyperKitty?expand=0&rev=76 --- python-HyperKitty.changes | 5 +++++ python-HyperKitty.spec | 31 +++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/python-HyperKitty.changes b/python-HyperKitty.changes index 6eaad14..ed28958 100644 --- a/python-HyperKitty.changes +++ b/python-HyperKitty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 24 20:34:06 UTC 2024 - Georg Pfuetzenreuter + +- Split out system user + ------------------------------------------------------------------- Fri Feb 23 22:20:00 UTC 2024 - Georg Pfuetzenreuter diff --git a/python-HyperKitty.spec b/python-HyperKitty.spec index 929c588..0809f3a 100644 --- a/python-HyperKitty.spec +++ b/python-HyperKitty.spec @@ -41,6 +41,7 @@ %global webapps_dir /srv/www/webapps %global hyperkitty_pkgname HyperKitty +%global lowname hyperkitty %global hyperkitty_basedir %{webapps_dir}/mailman/hyperkitty %global hyperkitty_localedir %{hyperkitty_basedir}/locale @@ -182,8 +183,7 @@ Requires: %{hyperkitty_pkgname} Requires: acl Requires: openssl Requires: sudo -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd +Requires: system-user-%{lowname} %description -n %{hyperkitty_pkgname}-web A web user interface for GNU Mailman. @@ -204,6 +204,15 @@ A web user interface for GNU Mailman. This package holds the uwsgi configuration. +%package -n system-user-%{lowname} +Summary: System user for HyperKitty +BuildArch: noarch +BuildRequires: sysuser-tools +%sysusers_requires + +%description -n system-user-%{lowname} +System user for HyperKitty. + %prep %setup -n HyperKitty-%{version} cp %{SOURCE30} . @@ -214,6 +223,10 @@ rsync -a example_project/* build_static_files %autopatch -p1 +tee > %{lowname}.sysuser <