Compare commits

...

2 Commits

2 changed files with 50 additions and 5 deletions

View File

@ -0,0 +1,38 @@
From 0203ce3979c17cfb79ab339d092d9861ee9de697 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Tue, 9 Jan 2024 16:32:53 -0500
Subject: [PATCH] Correct the mailing address of the FSF (pointed out by Neil
Hanlon)
---
COPYRIGHT | 2 +-
contrib/remind-conf-mode/remind-conf-mode.el | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/COPYRIGHT b/COPYRIGHT
index 0c17634..e26a4b7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -16,7 +16,7 @@ individual files.
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/contrib/remind-conf-mode/remind-conf-mode.el b/contrib/remind-conf-mode/remind-conf-mode.el
index 725e5ff..1454990 100644
--- a/contrib/remind-conf-mode/remind-conf-mode.el
+++ b/contrib/remind-conf-mode/remind-conf-mode.el
@@ -19,8 +19,7 @@
;; You should have received a copy of the GNU General Public License
;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
;;; Commentary:

View File

@ -4,9 +4,6 @@ Release: %autorelease
Summary: Sophisticated calendar and alarm program
# GPL-2.0-only: main software
# BSD-2-Clause:
# - src/json.c
# - src/json.h
# GPL-2.0-only AND LicenseRef-Fedora-Public-Domain:
# - src/moon.c
# LicenseRef-Fedora-Public-Domain:
@ -19,6 +16,11 @@ Source: 685A5A5E511D30E2.gpg
Source: tkremind.desktop
# stolen from Debian
Patch: use-system-libjsonparser.diff
Patch: https://git.skoll.ca/Skollsoft-Public/Remind/commit/0203ce3979c17cfb79ab339d092d9861ee9de697.patch
# temporary
Patch: remove-timezone-tests-from-compare.patch
BuildRequires: gcc
@ -61,11 +63,12 @@ Documentation and information on how to use remind
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}
Provides: tkremind = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: tcl
Requires: tcllib
Requires: tk >= 8.0
Suggests: google-noto-fonts
%description gui
Tkremind provides a GUI which allows viewing a calendar and adding or editing
@ -92,6 +95,10 @@ Tools to convert the remind output to ps, pdf or html as well as example files.
# Disable packlist and perllocal update
sed -i 's|\$(PERL) Makefile.PL|\$(PERL) Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="$RPM_OPT_FLAGS"|g' rem2pdf/Makefile.top.in
# json-parser is in fedora; remove bundled copies
rm src/json.h
rm src/json.c
%build
%configure
%make_build