.gitignore

@@ -6,5 +6,3 @@
 /agenda-1.1.0.tar.gz
 /agenda-1.1.1.tar.gz
 /agenda-1.1.2.tar.gz
-/agenda-1.2.0.tar.gz
-/agenda-1.2.1.tar.gz

0001-Add-launchable-tag-to-AppStream-metadata.patch

@@ -0,0 +1,33 @@
+From 36baf7f1e783af90cfd82da3d93fa326574d931c Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Sat, 14 May 2022 07:58:11 -0400
+Subject: [PATCH 1/4] Add <launchable/> tag to AppStream metadata
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#qsr-app-launchable-info
+
+Omitting this tag now now triggers a hard validation error in
+“appstreamcli validate”:
+
+https://github.com/ximion/appstream/commit/ad98bfd8db789c80507e82278d6d766acba4937c
+---
+ data/com.github.dahenson.agenda.appdata.xml.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/com.github.dahenson.agenda.appdata.xml.in b/data/com.github.dahenson.agenda.appdata.xml.in
+index 092d3bd..27b48b7 100644
+--- a/data/com.github.dahenson.agenda.appdata.xml.in
++++ b/data/com.github.dahenson.agenda.appdata.xml.in
+@@ -9,6 +9,7 @@
+   <developer_name>Dane Henson</developer_name>
+   <url type="homepage">http://brainofdane.com</url>
+   <url type="bugtracker">https://github.com/dahenson/agenda/issues</url>
++  <launchable type="desktop-id">com.github.dahenson.agenda.desktop</launchable>
+   <screenshots>
+     <screenshot type="default">
+       <image>https://raw.githubusercontent.com/dahenson/agenda/master/data/screenshot.png</image>
+-- 
+2.43.2
+

0002-Convert-homepage-link-from-HTTP-to-HTTPS-in-AppData-.patch

@@ -0,0 +1,25 @@
+From 9c0353167c4e335ce269b4358c7223dc062e34a4 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 9 Nov 2023 12:34:04 -0500
+Subject: [PATCH 2/4] Convert homepage link from HTTP to HTTPS in AppData XML
+
+---
+ data/com.github.dahenson.agenda.appdata.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/com.github.dahenson.agenda.appdata.xml.in b/data/com.github.dahenson.agenda.appdata.xml.in
+index 27b48b7..4d5134c 100644
+--- a/data/com.github.dahenson.agenda.appdata.xml.in
++++ b/data/com.github.dahenson.agenda.appdata.xml.in
+@@ -7,7 +7,7 @@
+   <name>Agenda</name>
+   <summary>Get things done</summary>
+   <developer_name>Dane Henson</developer_name>
+-  <url type="homepage">http://brainofdane.com</url>
++  <url type="homepage">https://brainofdane.com</url>
+   <url type="bugtracker">https://github.com/dahenson/agenda/issues</url>
+   <launchable type="desktop-id">com.github.dahenson.agenda.desktop</launchable>
+   <screenshots>
+-- 
+2.43.2
+

0003-Fix-deprecated-top-level-developer_name-in-AppData-X.patch

@@ -0,0 +1,28 @@
+From 97f771c34ebc4b8edf4abc9330e9a3d1402fea89 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 9 Nov 2023 12:21:20 -0500
+Subject: [PATCH 3/4] Fix deprecated top-level developer_name in AppData XML
+
+Use the name element in a developer block instead, as recommended by appstreamcli 1.0.0.
+---
+ data/com.github.dahenson.agenda.appdata.xml.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/data/com.github.dahenson.agenda.appdata.xml.in b/data/com.github.dahenson.agenda.appdata.xml.in
+index 4d5134c..c4811fd 100644
+--- a/data/com.github.dahenson.agenda.appdata.xml.in
++++ b/data/com.github.dahenson.agenda.appdata.xml.in
+@@ -6,7 +6,9 @@
+   <project_license>GPL-3.0+</project_license>
+   <name>Agenda</name>
+   <summary>Get things done</summary>
+-  <developer_name>Dane Henson</developer_name>
++  <developer>
++    <name>Dane Henson</name>
++  </developer>
+   <url type="homepage">https://brainofdane.com</url>
+   <url type="bugtracker">https://github.com/dahenson/agenda/issues</url>
+   <launchable type="desktop-id">com.github.dahenson.agenda.desktop</launchable>
+-- 
+2.43.2
+

0004-Add-a-developer-ID-in-AppData-XML.patch

@@ -0,0 +1,26 @@
+From 714a6f21ebf85f26390d54b95d50c63636171b80 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Wed, 6 Mar 2024 07:41:31 -0500
+Subject: [PATCH 4/4] Add a developer ID in AppData XML
+
+This is a warning in appstreamcli 1.0.2.
+---
+ data/com.github.dahenson.agenda.appdata.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/com.github.dahenson.agenda.appdata.xml.in b/data/com.github.dahenson.agenda.appdata.xml.in
+index c4811fd..629eb76 100644
+--- a/data/com.github.dahenson.agenda.appdata.xml.in
++++ b/data/com.github.dahenson.agenda.appdata.xml.in
+@@ -6,7 +6,7 @@
+   <project_license>GPL-3.0+</project_license>
+   <name>Agenda</name>
+   <summary>Get things done</summary>
+-  <developer>
++  <developer id="com.brainofdane">
+     <name>Dane Henson</name>
+   </developer>
+   <url type="homepage">https://brainofdane.com</url>
+-- 
+2.43.2
+

agenda.rpmlintrc

@@ -4,3 +4,5 @@ addFilter(r" summary-not-capitalized ka ")
 # A man page for a GUI executable without interesting command-line options is
 # not very useful.
 addFilter(r" no-manual-page-for-binary ")
+# Hardlinks within a directory owned by a package are safe.
+addFilter(r" cross-directory-hard-link \S*/icons/hicolor/\S* \S*/icons/hicolor/\S*")

agenda.spec

@@ -2,23 +2,50 @@
 
 Name:           agenda
 Summary:        A simple, slick, speedy and no-nonsense task manager
-Version:        1.2.1
+Version:        1.1.2
 Release:        %autorelease
-
 # The entire source is GPL-3.0-or-later, except:
 #   - data/Agenda.css is GPL-2.0-or-later; it is not installed directly, but is
 #     incorporated in the executable as a “resource”
 #   - data/com.github.dahenson.agenda.appdata.xml.in is CC0-1.0, which is
 #     allowed for content only
-License:        GPL-3.0-or-later AND GPL-2.0-or-later AND CC0-1.0
+#
 # Additionally, the following do not affect the License because they are not
 # part of the binary RPM:
 #
 #   - test/TestCase.vala is LGPL-2.0-or-later
-SourceLicense:  %{license} AND LGPL-2.0-or-later
+License:        GPL-3.0-or-later AND GPL-2.0-or-later AND CC0-1.0
+
 URL:            https://github.com/dahenson/agenda
 Source:         %{url}/archive/%{version}/agenda-%{version}.tar.gz
 
+# Add <launchable/> tag to AppStream metadata
+# https://github.com/dahenson/agenda/pull/148
+#
+# https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#qsr-app-launchable-info
+#
+# Omitting this tag now now triggers a hard validation error in “appstreamcli
+# validate”:
+#
+# https://github.com/ximion/appstream/commit/ad98bfd8db789c80507e82278d6d766acba4937c
+Patch:          0001-Add-launchable-tag-to-AppStream-metadata.patch
+# Convert homepage link from HTTP to HTTPS in AppData XML
+# https://github.com/dahenson/agenda/pull/152/commits/39bd498e8959e14e6a3ac7530ae49eb71aa91599
+#
+# From:
+#
+# Convert HTTP links to HTTPS
+# https://github.com/dahenson/agenda/pull/152
+#
+# Rebased on 1.1.2 and on top of PR#148
+Patch:          0002-Convert-homepage-link-from-HTTP-to-HTTPS-in-AppData-.patch
+# Fix deprecated top-level developer_name in AppData XML
+# https://github.com/dahenson/agenda/pull/151
+#
+# Rebased on 1.1.2 and on top of PR#148 and PR#152
+Patch:          0003-Fix-deprecated-top-level-developer_name-in-AppData-X.patch
+Patch:          0004-Add-a-developer-ID-in-AppData-XML.patch
+
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
@@ -49,7 +76,6 @@ Summary(es):    Un administrador de tareas simple, pulido, rápido y sin complic
 Summary(fr):    Un gestionnaire de tâches simple, rapide et élégant
 Summary(gl):    Un xestor de tarefas pulido, sinxelo, rápido e sen complicacións
 Summary(it):    Un promemoria semplice, elegante, veloce e senza fronzoli
-# This translation is for the alternative summary, “Get things done”
 Summary(ja):    タスクを完了しましょう
 Summary(ka):    მარტივი, მოხერხებული, სწრაფი დავალებების მმართველი ყოველგვარი უაზრობების გარეშე
 Summary(ko):    간단하고 미려한 일정 관리자
@@ -81,22 +107,6 @@ Key Features:
   • Undo/Redo with Ctrl-Z and Ctrl-Y
   • Quit with the Esc key
 
-%description -l it
-Un task manager per aiutarti a tenere traccia delle attività che contano di
-più.
-
-A volte, hai solo bisogno di un elenco di attività per mantenerti motivato.
-Agenda fornisce un modo per annotare i tuoi compiti e spuntarli mentre li
-completi. L'elenco viene salvato automaticamente, quindi puoi chiudere
-l'elenco per estrarlo in modo senza perdere il tuo posto.
-
-Caratteristiche principali:
-
-  • Salva automaticamente l'elenco delle attività
-  • Visualizza le tue attività completate finché non scegli di eliminarle
-  • Completamento automatico per attività aggiunte in precedenza
-  • Esci con il tasto Esc
-
 %description -l ja
 最も重要なタスクの記録に便利な、タスク管理アプリです。
 
@@ -147,11 +157,8 @@ Funcionalidades principais:
 %autosetup -p1
 
 
-%conf
-%meson
-
-
 %build
+%meson
 %meson_build
 
 

sources

@@ -1 +1 @@
-SHA512 (agenda-1.2.1.tar.gz) = 9140024adf070f4585806468daabf9c4a281a1eb5553548fd34f4076464ca0494ca952cbc5d9bc157448ec4cffa57f4c37f448a26bf9fbbe4949ef2ebed188b6
+SHA512 (agenda-1.1.2.tar.gz) = 435b8d0833aee8ba737540e4ee4765b182ec9821733f6fc20500312c6a28b6bc0bf9417db26bd9a3cae5b16cd9c5fe4dd3bb1817dea0317a4ce58fe1e9eb8562