.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

agenda.rpmlintrc

@@ -1,6 +0,0 @@
-# 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 ")

agenda.spec

@@ -1,41 +1,23 @@
-%global app_id com.github.dahenson.agenda
+%global appname com.github.dahenson.agenda
 
 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 GPLv3+, except data/Agenda.css which is GPLv2+,
+# test/TestCase.vala which is LGPLv2+, and
+# data/com.github.dahenson.agenda.appdata.xml.in which is CC0. This results in
+# an effective license of GPLv3+.
+License:        GPLv3+
 
-# 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
-URL:            https://github.com/dahenson/agenda
-Source:         %{url}/archive/%{version}/agenda-%{version}.tar.gz
-
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch:    %{ix86}
+URL:            https://github.com/dahenson/%{name}
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-
-# Still required by guidelines for now
-# (https://pagure.io/packaging-committee/issue/1053):
 BuildRequires:  libappstream-glib
-# Matches what gnome-software and others use:
-BuildRequires:  appstream
-
-BuildRequires:  hardlink
-
 BuildRequires:  meson
 BuildRequires:  vala
-BuildRequires:  gcc
 
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite)
@@ -49,7 +31,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 +62,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
 最も重要なタスクの記録に便利な、タスク管理アプリです。
 
@@ -144,51 +109,38 @@ Funcionalidades principais:
 
 
 %prep
-%autosetup -p1
-
-
-%conf
-%meson
+%autosetup
 
 
 %build
+%meson
 %meson_build
 
 
 %install
 %meson_install
 
-%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'
+%find_lang %{appname}
 
 
 %check
 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{app_id}.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-# Still required by guidelines for now
-# (https://pagure.io/packaging-committee/issue/1053):
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml
-# Matches what gnome-software and others use:
-appstreamcli validate --no-net --explain \
-    %{buildroot}/%{_metainfodir}/%{app_id}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
-%files -f %{app_id}.lang
+%files -f %{appname}.lang
 %doc README.md
 %license LICENSE
 
-%{_bindir}/%{app_id}
+%{_bindir}/%{appname}
 
-%{_datadir}/applications/%{app_id}.desktop
-%{_datadir}/glib-2.0/schemas/%{app_id}.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/%{app_id}.svg
-%{_metainfodir}/%{app_id}.appdata.xml
+%{_datadir}/applications/%{appname}.desktop
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

sources

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