rpm/python-HyperKitty
SHA256
1
0
Fork 0
forked from pool/python-HyperKitty
Code Pull Requests Activity

Accepting request 1151771 from devel:languages:python:mailman

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1151771
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-HyperKitty?expand=0&rev=24
This commit is contained in:
Ana Guerrero
2024-02-26 18:49:21 +00:00
committed by Git OBS Bridge
parent 9300f69dbe f83a9ec61b
commit 93c7e02dd6
2 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python-HyperKitty.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Feb 24 20:34:06 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
- Split out system user
-------------------------------------------------------------------
Fri Feb 23 22:20:00 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
- Build for Python 3.12
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 6 12:05:07 UTC 2023 - Marcus Rueckert <mrueckert@suse.de> Mon Nov 6 12:05:07 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>

62
python-HyperKitty.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-HyperKitty # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%bcond_without testsuite %bcond_without testsuite
# keep in sync with setup.py # keep in sync with setup.py
@@ -40,6 +41,7 @@
%global webapps_dir /srv/www/webapps %global webapps_dir /srv/www/webapps
%global hyperkitty_pkgname HyperKitty %global hyperkitty_pkgname HyperKitty
%global lowname hyperkitty
%global hyperkitty_basedir %{webapps_dir}/mailman/hyperkitty %global hyperkitty_basedir %{webapps_dir}/mailman/hyperkitty
%global hyperkitty_localedir %{hyperkitty_basedir}/locale %global hyperkitty_localedir %{hyperkitty_basedir}/locale
@@ -52,19 +54,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 %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 %if 0%{?suse_version} >= 1550
# Newest python supported by mailman is Python 3.11 # Newest python supported by mailman is Python 3.12 (?)
%define pythons python311 %define pythons python312
%define mypython python311 %define mypython python312
%define __mypython %{__python311} %define __mypython %{__python312}
%define mypython_sitelib %{python311_sitelib} %define mypython_sitelib %{python312_sitelib}
%else %else
%{?sle15_python_module_pythons} %{?sle15_python_module_pythons}
%define pythons python311 %define pythons python312
%define mypython python311 %define mypython python312
%define __mypython %{__python311} %define __mypython %{__python312}
%define mypython_sitelib %{python311_sitelib} %define mypython_sitelib %{python312_sitelib}
%endif %endif
Name: python-HyperKitty Name: python-HyperKitty
@@ -93,13 +95,13 @@ Patch0: hyperkitty-settings.patch
Patch2: mistune3.patch Patch2: mistune3.patch
# #
# PATCH-FIX-UPSTREAM gl-mr300-add-opengraph-metadata.patch gl#mailman/hyperkitty#300 # 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 # 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 >= %{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 Whoosh}
BuildRequires: %{python_module django-compressor >= %{django_compressor_min_version}}
BuildRequires: %{python_module django-debug-toolbar >= 2.2} BuildRequires: %{python_module django-debug-toolbar >= 2.2}
BuildRequires: %{python_module django-extensions >= %{django_extensions_min_version}} BuildRequires: %{python_module django-extensions >= %{django_extensions_min_version}}
BuildRequires: %{python_module django-gravatar2 >= %{django_gravatar2_min_version}} BuildRequires: %{python_module django-gravatar2 >= %{django_gravatar2_min_version}}
@@ -154,7 +156,7 @@ Requires: %{mypython}-django-haystack >= 2.8.0
Requires: %{mypython}-django-mailman3 >= %{django_mailman3_min_version} Requires: %{mypython}-django-mailman3 >= %{django_mailman3_min_version}
Requires: %{mypython}-django-q >= %{django_q_min_version} Requires: %{mypython}-django-q >= %{django_q_min_version}
Requires: %{mypython}-djangorestframework >= %{djangorestframework_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}-mailmanclient >= %{mailmanclient_min_version}
Requires: %{mypython}-mistune >= %{mistune_min_version} Requires: %{mypython}-mistune >= %{mistune_min_version}
Requires: %{mypython}-networkx >= %{networkx_min_version} Requires: %{mypython}-networkx >= %{networkx_min_version}
@@ -181,8 +183,7 @@ Requires: %{hyperkitty_pkgname}
Requires: acl Requires: acl
Requires: openssl Requires: openssl
Requires: sudo Requires: sudo
Requires(pre): /usr/sbin/groupadd Requires: system-user-%{lowname}
Requires(pre): /usr/sbin/useradd
%description -n %{hyperkitty_pkgname}-web %description -n %{hyperkitty_pkgname}-web
A web user interface for GNU Mailman. A web user interface for GNU Mailman.
@@ -203,6 +204,15 @@ A web user interface for GNU Mailman.
This package holds the uwsgi configuration. 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 %prep
%setup -n HyperKitty-%{version} %setup -n HyperKitty-%{version}
cp %{SOURCE30} . cp %{SOURCE30} .
@@ -213,6 +223,10 @@ rsync -a example_project/* build_static_files
%autopatch -p1 %autopatch -p1
tee > %{lowname}.sysuser <<EOF
u %{lowname} - "HyperKitty" %{hyperkitty_basedir} -
EOF
%build %build
sed -i 's|^#!/usr/bin/env.*|#!%{__mypython}|' \ sed -i 's|^#!/usr/bin/env.*|#!%{__mypython}|' \
example_project/manage.py example_project/manage.py
@@ -226,6 +240,8 @@ export PYTHONPATH=$(pwd)
%python_exec build_static_files/manage.py collectstatic --clear --noinput %python_exec build_static_files/manage.py collectstatic --clear --noinput
%python_exec build_static_files/manage.py compress --force %python_exec build_static_files/manage.py compress --force
%sysusers_generate_pre %{lowname}.sysuser %{lowname}
%install %install
install -d -m 0750 \ install -d -m 0750 \
%{buildroot}%{hyperkitty_etcdir} \ %{buildroot}%{hyperkitty_etcdir} \
@@ -275,7 +291,7 @@ ln -svf %{hyperkitty_etcdir}/settings_local.py \
# Manage script # Manage script
install -d -m 0755 %{buildroot}%{_sbindir} install -d -m 0755 %{buildroot}%{_sbindir}
install -m 0750 %{SOURCE10} %{buildroot}%{_sbindir}/hyperkitty-manage install -m 0755 %{SOURCE10} %{buildroot}%{_sbindir}/hyperkitty-manage
install -d -m 0755 %{buildroot}%{_sysconfdir}/uwsgi/vassals install -d -m 0755 %{buildroot}%{_sysconfdir}/uwsgi/vassals
install -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/uwsgi/vassals/hyperkitty.ini install -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/uwsgi/vassals/hyperkitty.ini
@@ -315,6 +331,8 @@ for job in \
sed -i "s#@HYPERKITTY_RUNJOB@#${hyperkitty_runjob_name}#g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer sed -i "s#@HYPERKITTY_RUNJOB@#${hyperkitty_runjob_name}#g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer
done done
install -Dm644 %{lowname}.sysuser %{buildroot}%{_sysusersdir}/%{lowname}.conf
%if %{with testuite} %if %{with testuite}
%check %check
export PYTHONPATH="$(pwd)" export PYTHONPATH="$(pwd)"
@@ -323,11 +341,10 @@ export LANG=C.UTF-8
%endif %endif
%pre -n %{hyperkitty_pkgname}-web %pre -n %{hyperkitty_pkgname}-web
/usr/sbin/groupadd -r hyperkitty || :
/usr/sbin/useradd -g hyperkitty -s /bin/false -r -c "HyperKitty" -d %{hyperkitty_basedir} hyperkitty || :
%service_add_pre %{hyperkitty_services} %service_add_pre %{hyperkitty_services}
%pre -n system-user-%{lowname} -f %{lowname}.pre
%post -n %{hyperkitty_pkgname}-web %post -n %{hyperkitty_pkgname}-web
# We need a SECRET_KEY for manage to work # We need a SECRET_KEY for manage to work
if ! grep -q "^SECRET_KEY.*" %{hyperkitty_etcdir}/settings_local.py; then if ! grep -q "^SECRET_KEY.*" %{hyperkitty_etcdir}/settings_local.py; then
@@ -401,4 +418,7 @@ fi
%dir %{_sysconfdir}/uwsgi/vassals %dir %{_sysconfdir}/uwsgi/vassals
%config (noreplace) %{_sysconfdir}/uwsgi/vassals/hyperkitty.ini %config (noreplace) %{_sysconfdir}/uwsgi/vassals/hyperkitty.ini
%files -n system-user-%{lowname}
%{_sysusersdir}/%{lowname}.conf
%changelog %changelog