diff --git a/.gitignore b/.gitignore index 0a70900..b3e9474 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /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 diff --git a/148.patch b/148.patch deleted file mode 100644 index e46a194..0000000 --- a/148.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bcc7f6f8db6fdbc525731abcfa767039d5f503be Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Sat, 14 May 2022 07:58:11 -0400 -Subject: [PATCH] Add 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 @@ - Dane Henson - http://brainofdane.com - https://github.com/dahenson/agenda/issues -+ com.github.dahenson.agenda.desktop - - - https://raw.githubusercontent.com/dahenson/agenda/master/data/screenshot.png diff --git a/agenda.rpmlintrc b/agenda.rpmlintrc new file mode 100644 index 0000000..2fc22b1 --- /dev/null +++ b/agenda.rpmlintrc @@ -0,0 +1,6 @@ +# We are not going to adjust capitalization in translated text! We trust the +# human who translated it more than the program linting it. +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 ") diff --git a/agenda.spec b/agenda.spec index aff2d25..7c7bf93 100644 --- a/agenda.spec +++ b/agenda.spec @@ -2,32 +2,25 @@ Name: agenda Summary: A simple, slick, speedy and no-nonsense task manager -Version: 1.1.2 +Version: 1.2.1 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 -License: GPL-3.0-or-later AND GPL-2.0-or-later AND CC0-1.0 +SourceLicense: %{license} AND LGPL-2.0-or-later +URL: https://github.com/dahenson/agenda +Source: %{url}/archive/%{version}/agenda-%{version}.tar.gz -URL: https://github.com/dahenson/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz - -# Add tag to AppStream metadata -# -# 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: %{url}/pull/148.patch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -38,6 +31,8 @@ BuildRequires: libappstream-glib # Matches what gnome-software and others use: BuildRequires: appstream +BuildRequires: hardlink + BuildRequires: meson BuildRequires: vala BuildRequires: gcc @@ -54,6 +49,7 @@ 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): 간단하고 미려한 일정 관리자 @@ -85,6 +81,22 @@ 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 最も重要なタスクの記録に便利な、タスク管理アプリです。 @@ -135,8 +147,11 @@ Funcionalidades principais: %autosetup -p1 -%build +%conf %meson + + +%build %meson_build @@ -145,6 +160,11 @@ Funcionalidades principais: %find_lang %{app_id} +# Upstream installs the same SVG icon in many size-specific directories like +# /usr/share/icons/hicolor/64x64@2/; we can save space by hardlinking these +# together. +hardlink -c -v '%{buildroot}%{_datadir}/icons/hicolor' + %check desktop-file-validate \ @@ -155,7 +175,7 @@ desktop-file-validate \ appstream-util validate-relax --nonet \ %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml # Matches what gnome-software and others use: -appstreamcli validate --nonet \ +appstreamcli validate --no-net --explain \ %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml diff --git a/sources b/sources index 439fdeb..e8856d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (agenda-1.1.2.tar.gz) = 435b8d0833aee8ba737540e4ee4765b182ec9821733f6fc20500312c6a28b6bc0bf9417db26bd9a3cae5b16cd9c5fe4dd3bb1817dea0317a4ce58fe1e9eb8562 +SHA512 (agenda-1.2.1.tar.gz) = 9140024adf070f4585806468daabf9c4a281a1eb5553548fd34f4076464ca0494ca952cbc5d9bc157448ec4cffa57f4c37f448a26bf9fbbe4949ef2ebed188b6