Compare commits
17 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 055c461672 | |||
| 7cdee4b3c0 | |||
| 5f55119204 | |||
| 267e4cb3ab | |||
| 55c8032131 | |||
| d9d44050d5 | |||
| 3549166672 | |||
| 5d04f3250b | |||
| afc29cc395 | |||
| f66d65b3b0 | |||
| 8c9151924f | |||
| 101ecc4f03 | |||
| 4c0ac3fbd5 | |||
| 7c4a082a1a | |||
| 8b64fc4fc6 | |||
| c08c9f9599 | |||
| dc2568b6bf |
25
django52.patch
Normal file
25
django52.patch
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
From b8b7536c2cb7380ec55ed62140617cff8ae36b1d Mon Sep 17 00:00:00 2001
|
||||||
|
From: SATOH Fumiyasu <fumiyas@osstech.co.jp>
|
||||||
|
Date: Fri, 1 Aug 2025 23:18:30 +0000
|
||||||
|
Subject: [PATCH] feat: Add Python 3.13 and Django 5.2 (LTS) support
|
||||||
|
|
||||||
|
---
|
||||||
|
.gitlab-ci.yml | 43 ++++++++++++++++---------------------------
|
||||||
|
doc/news.rst | 2 ++
|
||||||
|
pyproject.toml | 3 +--
|
||||||
|
tox.ini | 4 ++--
|
||||||
|
4 files changed, 21 insertions(+), 31 deletions(-)
|
||||||
|
|
||||||
|
Index: hyperkitty-1.3.12/pyproject.toml
|
||||||
|
===================================================================
|
||||||
|
--- hyperkitty-1.3.12.orig/pyproject.toml
|
||||||
|
+++ hyperkitty-1.3.12/pyproject.toml
|
||||||
|
@@ -23,7 +23,7 @@ dependencies = [
|
||||||
|
"django-gravatar2>=1.0.6",
|
||||||
|
"django-haystack>=2.8.0",
|
||||||
|
"django-q2>=1.0.0",
|
||||||
|
- "django>=4.2,<5.1",
|
||||||
|
+ "django>=4.2,<5.3",
|
||||||
|
"django_mailman3>=1.3.13",
|
||||||
|
"djangorestframework>=3.0.0",
|
||||||
|
"flufl.lock>=4.0",
|
||||||
3
hyperkitty-1.3.12.tar.gz
Normal file
3
hyperkitty-1.3.12.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:deb582937ec5bc9ea9c1d5d86bfb76a4da429b60e1fea6fd6964e7c667cf161d
|
||||||
|
size 2231630
|
||||||
16
hyperkitty-1.3.12.tar.gz.asc
Normal file
16
hyperkitty-1.3.12.tar.gz.asc
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEVB6gRIRTOU/3eg7MnZsroGHQpnwFAmbueWwACgkQnZsroGHQ
|
||||||
|
pnxsWRAAzB3qp5jEdyUzUI28ptQFdFPQrYfOESVGTwsYzQ88/MxDGnbjhcbs4Ch6
|
||||||
|
OGt/xATlxbIeiO1fYIYryBO/ZyP3JiwC6PUTaHYnGFGi9rEgJKqaAg2JC10fKBsA
|
||||||
|
EOKd/Rda9RONZTf54BvODpGl8OgUXGPqblr/xuaddewGfn3pcCiVD3juND8Eromz
|
||||||
|
U4smsonht08F64jaWGO5Ki2sPaUrXIYfKJdzUMCC5GTwRQLafPEgomamrgfBMcwa
|
||||||
|
G5LyZt6DXHGEBf0gQKtdR5ixKv4Y6Hk4l2U0NKT3gi5fb6YRF9ftXBZGlRpGEVrj
|
||||||
|
58xLL4B41ltisf4S5xvZbHidhfvD1hnSpp2RDZtocjkozfk5y71wOSpCZ1/Py19l
|
||||||
|
keS8Dh4ey90R121+8fa9SBTowIZW3cD4IxlmcJwfNPsuy6wHCv8SJx2I91eiN6rA
|
||||||
|
z3XTIhk30VFLky7qDLDodH5KucQop0jF+TbvqtJ45HTb4HV30Fx+5eYJMSW5eQAR
|
||||||
|
SjuYnJih2T/n3o07mRxqhpl9awpdhhLyVsKTevqBLCFES/pmSpwun+bX++JLx4kg
|
||||||
|
trIVqVYYi+4uUyF7EH0ixOOYVmCx9rJzdLXyX8c9BxKp23zcQcWsxffZzwNpa0N2
|
||||||
|
9BpT9w/Vn6wdoKqzsyen6CXgRSDVv9kpgpLZtJ85Y6PfcwroJnY=
|
||||||
|
=R3Fq
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:05f842878cd971fc2821fb9b5bff8c5165f0875c85387fe3a5175076c8fa94c1
|
|
||||||
size 2204377
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEVB6gRIRTOU/3eg7MnZsroGHQpnwFAmXdpUoACgkQnZsroGHQ
|
|
||||||
pnyY9g//RnBU9jWIctSQSxpU5KkSigsznJ98WfrZDt8bJus/AIt9heMSKHsnOo7s
|
|
||||||
DkU6Bd+W92bk685nUJxLws4AncsWXqGnyANI2N8BWdTCTXDBgAPSlr9cryqO7rM7
|
|
||||||
n95eIMX8N40nS9WUeIV3qlHuDR0eBaNB0GseLu24W+JbB+JCKbxLn/nQT3MVeno4
|
|
||||||
WbAhq8NAQsE1IFbUTVyyoaETTuHbCkNoetmpz+OPR70zKs57as78FAYaGrOPdWpL
|
|
||||||
10DxIDOqQS4SZu9Ca1pv5avDOuP+1dkyR584mY462GX1yjb5m2IIIocBnOGbgqaL
|
|
||||||
Mz7cuc186e9KHWk43uPecj5i02D1oyoQ2HqswNkeT/p1It0H0vO86UI79wuewes6
|
|
||||||
WOvLibO0FnbINjv3ckLTi0JzpLSe4tVkJhzt59NeYkB0S8X9LXGM7MTXxiJYQhDP
|
|
||||||
orVGGTd7AFtA0QLqKH75ZgI1/vlpSeAJe5+tYORByPWCfeKZCyhe6sDEgqj4E+Fc
|
|
||||||
XDZov5gyS/b1yhvpU1OeaWKUh613PLnfSVpo8lS0mbYENAApkMNZkXGbssqXnDZP
|
|
||||||
Gtkj6PGHVBEN1rZWhKehMjPBvGuyfu1Jt0BxS99SbMKnKuUbPgm1MCUCgBvTZ3P0
|
|
||||||
1Ca6l2n06RJ7G+7jorPQhkPXOLJiG/73+Cj4K2uqhZe3pxwooh8=
|
|
||||||
=Ww80
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
@@ -1,3 +1,51 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 19 07:17:03 UTC 2025 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
- If possible build for primary_python (fixes Leap 16.0)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 18 09:09:01 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
||||||
|
|
||||||
|
- Add upstream django52.patch to officially support Django 5.2
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 11 13:19:11 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
|
||||||
|
|
||||||
|
- Add reproducible.patch for reproducible builds
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 7 11:33:38 UTC 2024 - Markéta Machová <mmachova@suse.com>
|
||||||
|
|
||||||
|
- Minor tweaks in spec to fix build
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Sep 21 12:05:35 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
- Update to version 1.3.12
|
||||||
|
* https://gitlab.com/mailman/hyperkitty/-/blob/1.3.12/doc/news.rst
|
||||||
|
or packaged news.rst
|
||||||
|
- Removed gl-mr635-empty_attachment.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 11 18:35:28 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
- Update to version 1.3.11
|
||||||
|
* https://gitlab.com/mailman/hyperkitty/-/blob/1.3.11/doc/news.rst
|
||||||
|
- Removed GPG signature as the download links don't work
|
||||||
|
- Removed requirement for pytz
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 18 20:22:39 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
|
||||||
|
|
||||||
|
- Add gl-mr635-empty_attachment.patch to resolve corrupted archive
|
||||||
|
downloads on mails with empty attachments
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jun 23 08:37:43 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
- Update to version 1.3.10
|
||||||
|
* https://gitlab.com/mailman/hyperkitty/-/releases/1.3.10
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Mar 2 07:57:47 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
|
Sat Mar 2 07:57:47 UTC 2024 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-HyperKitty
|
# spec file for package python-HyperKitty
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
#
|
#
|
||||||
# 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
|
||||||
@@ -19,16 +19,14 @@
|
|||||||
%bcond_without testsuite
|
%bcond_without testsuite
|
||||||
|
|
||||||
# keep in sync with setup.py
|
# keep in sync with setup.py
|
||||||
%global django_min_version 3.2
|
%global django_min_version 4.2
|
||||||
%global django_max_version 4.3
|
%global django_max_version 5.3
|
||||||
%global django_mailman3_min_version 1.3.10
|
%global django_mailman3_min_version 1.3.13
|
||||||
%global django_gravatar2_min_version 1.0.6
|
%global django_gravatar2_min_version 1.0.6
|
||||||
%global djangorestframework_min_version 3.0.0
|
%global djangorestframework_min_version 3.0.0
|
||||||
%global robot_detection_min_version 0.3
|
%global robot_detection_min_version 0.3
|
||||||
%global pytz_min_version 2012
|
|
||||||
%global django_compressor_min_version 1.3
|
%global django_compressor_min_version 1.3
|
||||||
%global mailmanclient_min_version 3.3.3
|
%global mailmanclient_min_version 3.3.3
|
||||||
# original this was >= 2.0.0, < 3.0 but overwritten by mistune3.patch
|
|
||||||
%global mistune_min_version 3.0
|
%global mistune_min_version 3.0
|
||||||
%global python_dateutil_min_version 2.0
|
%global python_dateutil_min_version 2.0
|
||||||
%global networkx_min_version 2.0
|
%global networkx_min_version 2.0
|
||||||
@@ -54,11 +52,13 @@
|
|||||||
%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-postorius/python-mailman-web
|
# 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
|
# Always only build one flavor
|
||||||
%if 0%{?suse_version} >= 1550
|
%if 0%{?sle_version} && 0%{?sle_version} < 160000
|
||||||
%define pythons python3
|
|
||||||
%else
|
|
||||||
%{?sle15_python_module_pythons}
|
%{?sle15_python_module_pythons}
|
||||||
|
%elif %{defined primary_python}
|
||||||
|
%define pythons %{primary_python}
|
||||||
|
%else
|
||||||
|
%define pythons python3
|
||||||
%endif
|
%endif
|
||||||
%global mypython %pythons
|
%global mypython %pythons
|
||||||
%global mypython_sitelib %{expand:%%{%{mypython}_sitelib}}
|
%global mypython_sitelib %{expand:%%{%{mypython}_sitelib}}
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
%define plainpython python
|
%define plainpython python
|
||||||
|
|
||||||
Name: python-HyperKitty
|
Name: python-HyperKitty
|
||||||
Version: 1.3.9
|
Version: 1.3.12
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A web interface to access GNU Mailman v3 archives
|
Summary: A web interface to access GNU Mailman v3 archives
|
||||||
License: GPL-3.0-only
|
License: GPL-3.0-only
|
||||||
@@ -94,7 +94,10 @@ Patch0: hyperkitty-settings.patch
|
|||||||
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
|
||||||
|
Patch100: reproducible.patch
|
||||||
#
|
#
|
||||||
|
# PATCH-FIX-UPSTREAM django52.patch feat: Add Python 3.13 and Django 5.2 (LTS) support
|
||||||
|
Patch101: django52.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 Whoosh}
|
BuildRequires: %{python_module Whoosh}
|
||||||
BuildRequires: %{python_module django-compressor >= %{django_compressor_min_version}}
|
BuildRequires: %{python_module django-compressor >= %{django_compressor_min_version}}
|
||||||
@@ -104,7 +107,7 @@ BuildRequires: %{python_module django-gravatar2 >= %{django_gravatar2_min_versi
|
|||||||
BuildRequires: %{python_module isort}
|
BuildRequires: %{python_module isort}
|
||||||
BuildRequires: %{python_module mailmanclient >= %{mailmanclient_min_version}}
|
BuildRequires: %{python_module mailmanclient >= %{mailmanclient_min_version}}
|
||||||
BuildRequires: %{python_module mistune >= %{mistune_min_version}}
|
BuildRequires: %{python_module mistune >= %{mistune_min_version}}
|
||||||
BuildRequires: %{python_module pdm}
|
BuildRequires: %{python_module pdm-backend}
|
||||||
BuildRequires: %{python_module pip}
|
BuildRequires: %{python_module pip}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
BuildRequires: %{python_module wheel}
|
BuildRequires: %{python_module wheel}
|
||||||
@@ -136,7 +139,6 @@ BuildRequires: %{python_module networkx >= %{networkx_min_version}}
|
|||||||
BuildRequires: %{python_module pytest-django}
|
BuildRequires: %{python_module pytest-django}
|
||||||
BuildRequires: %{python_module pytest}
|
BuildRequires: %{python_module pytest}
|
||||||
BuildRequires: %{python_module python-dateutil >= %{python_dateutil_min_version}}
|
BuildRequires: %{python_module python-dateutil >= %{python_dateutil_min_version}}
|
||||||
BuildRequires: %{python_module pytz >= %{pytz_min_version}}
|
|
||||||
BuildRequires: %{python_module robot-detection >= %{robot_detection_min_version}}
|
BuildRequires: %{python_module robot-detection >= %{robot_detection_min_version}}
|
||||||
# /SECTION
|
# /SECTION
|
||||||
|
|
||||||
@@ -160,7 +162,6 @@ 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}
|
||||||
Requires: %{mypython}-python-dateutil >= %{python_dateutil_min_version}
|
Requires: %{mypython}-python-dateutil >= %{python_dateutil_min_version}
|
||||||
Requires: %{mypython}-pytz >= %{pytz_min_version}
|
|
||||||
Requires: %{mypython}-robot-detection >= %{robot_detection_min_version}
|
Requires: %{mypython}-robot-detection >= %{robot_detection_min_version}
|
||||||
Requires: %{mypython}-xapian-haystack >= %{django_haystack_min_version}
|
Requires: %{mypython}-xapian-haystack >= %{django_haystack_min_version}
|
||||||
# help in replacing any previously installed flavor package back to the unprefixed package
|
# help in replacing any previously installed flavor package back to the unprefixed package
|
||||||
@@ -361,7 +362,7 @@ fi
|
|||||||
%service_del_postun %{hyperkitty_services}
|
%service_del_postun %{hyperkitty_services}
|
||||||
|
|
||||||
%files -n %{hyperkitty_pkgname}
|
%files -n %{hyperkitty_pkgname}
|
||||||
%doc AUTHORS.txt README.rst example_project
|
%doc AUTHORS.txt README.rst doc/news.rst example_project
|
||||||
%license COPYING.txt
|
%license COPYING.txt
|
||||||
%{mypython_sitelib}/hyperkitty
|
%{mypython_sitelib}/hyperkitty
|
||||||
%{mypython_sitelib}/hyperkitty-%{version}*-info
|
%{mypython_sitelib}/hyperkitty-%{version}*-info
|
||||||
@@ -371,6 +372,7 @@ fi
|
|||||||
%{_sbindir}/hyperkitty-manage
|
%{_sbindir}/hyperkitty-manage
|
||||||
%{_sbindir}/rchyperkitty-qcluster
|
%{_sbindir}/rchyperkitty-qcluster
|
||||||
%{_sbindir}/rchyperkitty-runjob-*
|
%{_sbindir}/rchyperkitty-runjob-*
|
||||||
|
%dir /srv/www
|
||||||
%dir %{webapps_dir}
|
%dir %{webapps_dir}
|
||||||
%dir %{webapps_dir}/mailman
|
%dir %{webapps_dir}/mailman
|
||||||
%{_unitdir}/hyperkitty-qcluster.service
|
%{_unitdir}/hyperkitty-qcluster.service
|
||||||
|
|||||||
27
reproducible.patch
Normal file
27
reproducible.patch
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
https://gitlab.com/mailman/hyperkitty/-/merge_requests/656
|
||||||
|
|
||||||
|
From 3961ea048f00da1004bbfe22f43ea2a494279d49 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
|
||||||
|
Date: Mon, 16 Dec 2024 16:08:45 +0100
|
||||||
|
Subject: [PATCH] Use content based hashing
|
||||||
|
|
||||||
|
for deterministic .css files
|
||||||
|
Without this patch, the mode defaulted to `mtime`
|
||||||
|
and caused variations between builds.
|
||||||
|
|
||||||
|
Fixes #527
|
||||||
|
|
||||||
|
This patch was done while working on reproducible builds for openSUSE, sponsored by the NLnet NGI0 fund.
|
||||||
|
|
||||||
|
diff --git a/example_project/settings.py b/example_project/settings.py
|
||||||
|
index ec7f742..1c53df6 100644
|
||||||
|
--- a/build_static_files/settings.py
|
||||||
|
+++ b/build_static_files/settings.py
|
||||||
|
@@ -304,6 +304,7 @@ SOCIALACCOUNT_PROVIDERS = {
|
||||||
|
# django-compressor
|
||||||
|
# https://pypi.python.org/pypi/django_compressor
|
||||||
|
#
|
||||||
|
+COMPRESS_CSS_HASHING_METHOD = 'content'
|
||||||
|
COMPRESS_PRECOMPILERS = (
|
||||||
|
('text/x-scss', 'sassc -t compressed {infile} {outfile}'),
|
||||||
|
('text/x-sass', 'sassc -t compressed {infile} {outfile}'),
|
||||||
Reference in New Issue
Block a user