From 4f6f7d0cd57f1ac2cba863713623e75413ab1c58 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Mon, 8 Jan 2024 14:52:35 -0500 Subject: [PATCH] update to 04.02.08 and address review comments * added desktop file * fixed bindir permissions --- .gitignore | 2 ++ remind.spec | 20 +++++++++++++------- sources | 4 ++-- tkremind.desktop | 8 ++++++++ 4 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 tkremind.desktop diff --git a/.gitignore b/.gitignore index 320b1ab..81310cc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /remind-04.02.07.tar.gz /remind-04.02.07.tar.gz.sig +/remind-04.02.08.tar.gz +/remind-04.02.08.tar.gz.sig diff --git a/remind.spec b/remind.spec index afba72f..56696f7 100644 --- a/remind.spec +++ b/remind.spec @@ -1,5 +1,5 @@ Name: remind -Version: 04.02.07 +Version: 04.02.08 Release: %autorelease Summary: Sophisticated calendar and alarm program @@ -16,6 +16,7 @@ URL: https://dianne.skoll.ca/projects/remind/ Source: %url/download/%{name}-%{version}.tar.gz Source: %url/download/%{name}-%{version}.tar.gz.sig Source: 685A5A5E511D30E2.gpg +Source: tkremind.desktop # stolen from Debian Patch: use-system-libjsonparser.diff @@ -29,6 +30,7 @@ BuildRequires: perl(Pango) BuildRequires: perl-generators BuildRequires: perl-interpreter BuildRequires: pkgconfig(json-parser) +BuildRequires: desktop-file-utils Recommends: remind-tools Recommends: remind-gui @@ -66,11 +68,12 @@ Summary: GUI for remind, a sophisticated calendar and alarm program License: GPL-2.0-only BuildArch: noarch Provides: tkremind = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: tcl Requires: tcllib Requires: tk >= 8.0 + %description gui Tkremind provides a GUI which allows viewing a calendar and adding or editing reminders without learning the syntax of Remind. @@ -88,11 +91,13 @@ sed -i 's|\$(PERL) Makefile.PL|\$(PERL) Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 %install %make_install +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3} + %files %doc README docs/ %license COPYRIGHT MICROSOFT-AND-APPLE +%attr(0755,-,-) %{_bindir}/%{name} %{_bindir}/rem -%{_bindir}/%{name} %{_datadir}/remind/ %{_mandir}/man1/rem.1* %{_mandir}/man1/%{name}.1* @@ -100,9 +105,9 @@ sed -i 's|\$(PERL) Makefile.PL|\$(PERL) Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 %files tools %doc www/ examples/ contrib/ %license COPYRIGHT MICROSOFT-AND-APPLE -%{_bindir}/rem2html -%{_bindir}/rem2pdf -%{_bindir}/rem2ps +%attr(0755,-,-) %{_bindir}/rem2html +%attr(0755,-,-) %{_bindir}/rem2pdf +%attr(0755,-,-) %{_bindir}/rem2ps %{perl_vendorlib}/* %{_mandir}/man1/rem2html.1* %{_mandir}/man1/rem2pdf.1* @@ -111,8 +116,9 @@ sed -i 's|\$(PERL) Makefile.PL|\$(PERL) Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 %{_mandir}/man3/Remind::PDF::Entry.3pm* %files gui -%{_bindir}/tkremind +%attr(0755,-,-) %{_bindir}/tkremind %{_mandir}/man1/tkremind.1* +%{_datadir}/applications/tkremind.desktop %changelog %autochangelog diff --git a/sources b/sources index 709bd9b..4e4d11a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (remind-04.02.07.tar.gz) = cfa644fc9532f53a4b0c2566643955a3ce915822ab2fe09ad2ac9dd857dbe15b4738000e1ffab3c5b9b23a368a28236bc61b7560bac07f3967b1bf446bf7f7e3 -SHA512 (remind-04.02.07.tar.gz.sig) = a6cfd33f553fde1d7914169dd4993efb1490692781ab194ee12e4f2fba5f99d1d274ffeb8a95aa894164581e14c289e7949d629a7c91cde417d0e19310644125 +SHA512 (remind-04.02.08.tar.gz) = c09a69003d19f7b0cbebe98bb0fdae028ecbed1dc14b72b2447dfd120f82bcff149b5aa0b16c921ec45448731371f8e98a6d9080bd064a05eadf5b2df5abdb1e +SHA512 (remind-04.02.08.tar.gz.sig) = 1ae14c5b28b78c2e9a50262788d5d5dee42f4bde3f038331de7202174b2d47d3037e5c103c81b3cb71a02f04ca70c029e1b62ddef5f0389443253529b0a6e5f9 diff --git a/tkremind.desktop b/tkremind.desktop new file mode 100644 index 0000000..1720c69 --- /dev/null +++ b/tkremind.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=tkremind +GenericName=Remind Tk GUI +Exec=tkremind +Terminal=false +Type=Application +Categories=Office;