From 1cb450d3b0fbba05119a8784fa4db58b41f435375adf6d07bee33907087764ff Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 6 Nov 2023 13:53:03 +0000 Subject: [PATCH] Accepting request 1123579 from openSUSE:infrastructure:mailman3 - forgot to use 2 defined variables: %{django_haystack_min_version} %{django_extensions_min_version} - make it easy to run a build without testsuite osc build --without=testsuite - refresh gl-mr300-add-opengraph-metadata.patch for version update - Add upstream patch gl-mr300-add-opengraph-metadata.patch: * Add OpenGraph Metadata (https://gitlab.com/mailman/hyperkitty/-/merge_requests/300) - Add upstream patch gl-mr470-introduce-feed-filtering.patch: * Introduce feed filtering (https://gitlab.com/mailman/hyperkitty/-/merge_requests/470) OBS-URL: https://build.opensuse.org/request/show/1123579 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-HyperKitty?expand=0&rev=73 --- gl-mr300-add-opengraph-metadata.patch | 302 ++++++++++++++++++++++++ gl-mr470-introduce-feed-filtering.patch | 51 ++++ python-HyperKitty.changes | 26 ++ python-HyperKitty.spec | 21 +- 4 files changed, 394 insertions(+), 6 deletions(-) create mode 100644 gl-mr300-add-opengraph-metadata.patch create mode 100644 gl-mr470-introduce-feed-filtering.patch diff --git a/gl-mr300-add-opengraph-metadata.patch b/gl-mr300-add-opengraph-metadata.patch new file mode 100644 index 0000000..661fcec --- /dev/null +++ b/gl-mr300-add-opengraph-metadata.patch @@ -0,0 +1,302 @@ +# Rewritten from upstream .patch to avoid fuzzing +Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/base.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/base.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/base.html +@@ -24,6 +24,11 @@ + {% block additional_stylesheets %} {% endblock %} + {% block head_feed %}{% endblock %} + {% include 'hyperkitty/headers.html' %} ++ ++ {% block additional_og %}{% endblock %} ++ ++ ++ + + + +Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/notimplemented.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/errors/notimplemented.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/notimplemented.html +@@ -7,6 +7,11 @@ + {% trans "Not implemented yet" %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +

{% trans "Not implemented" %}

+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/private.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/errors/private.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/private.html +@@ -7,6 +7,11 @@ + {% trans "Error: private list" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/index.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/index.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/index.html +@@ -9,6 +9,11 @@ + {% trans 'Available lists' %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/message.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message.html +@@ -1,12 +1,29 @@ + {% extends "hyperkitty/base.html" %} + {% load i18n %} + {% load hk_generic %} ++{% load gravatar %} + + + {% block head_title %} + {{ message.subject }} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++ ++ ++ ++ ++ ++{% for tag in message.thread.tags.distinct %} ++ ++{% endfor %} ++ ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message_new.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/message_new.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message_new.html +@@ -8,6 +8,11 @@ + {% trans "Create a new thread" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/overview.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/overview.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/overview.html +@@ -4,6 +4,13 @@ + {% load static %} + {% load cache %} + ++{% block additional_og %} ++ ++ ++ ++ ++{% endblock %} ++ + {% block head_title %} + {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} +Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/reattach.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/reattach.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/reattach.html +@@ -9,6 +9,11 @@ + {% trans "Reattach a thread" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/search_results.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/search_results.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/search_results.html +@@ -8,6 +8,11 @@ + {% trans "Search results for" %} "{{ query }}"{% if mlist %} - {{ mlist.display_name|default:mlist.name }} {% endif %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/thread.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread.html +@@ -3,12 +3,29 @@ + {% load i18n %} + {% load hk_generic %} + {% load static %} ++{% load gravatar %} + + + {% block head_title %} + {{ subject }} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++ ++ ++ ++ ++ ++{% for tag in thread.tags.distinct %} ++ ++{% endfor %} ++ ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread_list.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/thread_list.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread_list.html +@@ -13,6 +13,13 @@ + + {% endblock %} + ++{% block additional_og %} ++ ++ ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_posts.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/user_posts.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_posts.html +@@ -8,6 +8,11 @@ + {% trans "Messages by" %} {{ fullname }}{% if mlist %} - {{ mlist.display_name|default:mlist.name }} {% endif %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_profile/base.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/user_profile/base.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_profile/base.html +@@ -5,6 +5,11 @@ + {% trans "User posting activity" %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +