[rpms/remind] epel10: update to eclipseo's work on the spec

[rpms/remind] epel10: update to eclipseo's work on the spec

[Neil Hanlon]

A new commit has been pushed.

Repo   : rpms/remind
Branch : epel10
Commit : bd9719cc1013efd93e4648795129bb79d1753dbc
Author : Neil Hanlon <neil@shrug.pw>
Date   : 2024-02-07T14:11:55+00:00
Stats  : +92/-258 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/remind/c/bd9719cc1013efd93e4648795129bb79d1753dbc?branch=epel10

Log:
update to eclipseo's work on the spec

---
diff --git a/.gitignore b/.gitignore
index baec850..320b1ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /remind-04.02.06.tar.gz
 
+/remind-04.02.07.tar.gz
+/remind-04.02.07.tar.gz.sig

diff --git a/remind.spec b/remind.spec
index 9999392..afba72f 100644
--- a/remind.spec
+++ b/remind.spec
@@ -1,279 +1,118 @@
 Name:           remind
-Version:        04.02.06
-Release:        1%{?dist}
-Summary:        A sophisticated calendar and alarm program
-
-Group:          Applications/Productivity
-License:        GPLv2
+Version:        04.02.07
+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:
+# - src/md5.c
+License:        GPL-2.0-only AND BSD-2-Clause AND (GPL-2.0-only AND LicenseRef-Fedora-Public-Domain) AND LicenseRef-Fedora-Public-Domain
 URL:            https://dianne.skoll.ca/projects/remind/
-
-Source0:        https://dianne.skoll.ca/projects/remind/download/%{name}-%{version}.tar.gz
-Source1:        tkremind.desktop
-Source2:        %{name}-rpmlintrc
+Source:         %url/download/%{name}-%{version}.tar.gz
+Source:         %url/download/%{name}-%{version}.tar.gz.sig
+Source:         685A5A5E511D30E2.gpg
+# stolen from Debian
+Patch:          use-system-libjsonparser.diff
 
 BuildRequires:  gcc
-BuildRequires:  perl-Pango
-BuildRequires:  perl-Cairo
-BuildRequires:  perl-JSON-MaybeXS
-BuildRequires:  perl-ExtUtils-MakeMaker
-
-Requires:  perl
-Requires:  perl-Pango
-Requires:  perl-Cairo
-Requires:  perl-JSON-MaybeXS
+BuildRequires:  gnupg2
+BuildRequires:  make
+BuildRequires:  perl(Cairo)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(JSON::MaybeXS)
+BuildRequires:  perl(Pango)
+BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
+BuildRequires:  pkgconfig(json-parser)
+Recommends:     remind-tools
+Recommends:     remind-gui
 
 %description
 Remind is a sophisticated calendar and alarm program. It includes the following
 features:
-  * A sophisticated scripting language
-  * Plain-text, PDF, PostScript and HTML output
-  * Timed reminders and pop-up alarms
 
-%package gui
-Group:          Applications/Productivity
-Summary:        A graphical front-end for remind using Tcl/Tk
-BuildArchitectures: noarch
-BuildRequires:  desktop-file-utils
-Requires:       tk > 8.0
+ - A sophisticated scripting language and intelligent handling of exceptions
+   and holidays
+ - Plain-text, PDF, PostScript and HTML output
+ - Timed reminders and pop-up alarms
+ - A friendly graphical front-end for people who don't want to learn the
+   scripting language
+ - Facilities for both the Gregorian and Hebrew calendars
+ - Support for 12 different languages
+
+
+%package        tools
+Summary:        Additional tools for remind
+# GPL-2.0-or-later:
+#  - contrib/ical2rem.pl
+#  - contrib/rem2ics-0.93/rem2ics.spec
+#  - contrib/remind-conf-mode/remind-conf-mode.el
+# GPL-2.0-or-later AND GPL-2.0-only:
+#  - contrib/rem2ics-0.93/rem2ics
+# GPL-3.0-only:
+#  - contrib/remind-conf-mode/gpl.txt
+License:        GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only
+
+%description    tools
+Tools to convert the remind output to ps, pdf or html as well as example files.
+
+%package        gui
+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:       tcl
 Requires:       tcllib
-Requires:       remind = %{version}-%{release}
-#Requires:       google-noto-fonts-common
-#Requires:       google-noto-emoji-color-fonts
+Requires:       tk >= 8.0
 
-%description gui
-The remind-gui package contains a (self-described) "cheesy" graphical front
-end for Remind using Tcl/Tk.
+%description    gui
+Tkremind provides a GUI which allows viewing a calendar and adding or editing
+reminders without learning the syntax of Remind.
 
 %prep
-%setup -q
-
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%autosetup -p1 -n %{name}-%{version}
+# 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
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
-
-%check
-cd src
-if ! make test; then
-  set +x
-  for f in `find .. -name \*.diff -type f -print`; do
-    echo "TEST FAILURE: $f --"
-    cat "$f"
-    echo "-- $f result ends."
-  done
-  set -x
-fi
+%make_build
 
 %install
-# This preserves timestamps.
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
-chmod 0755 ${RPM_BUILD_ROOT}%{_bindir}/rem2pdf
-
-# Install desktop stuff.
-desktop-file-install \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
-  --add-category "Office"                          \
-  %{SOURCE1}
+%make_install
 
 %files
+%doc README docs/
+%license COPYRIGHT MICROSOFT-AND-APPLE
 %{_bindir}/rem
+%{_bindir}/%{name}
+%{_datadir}/remind/
+%{_mandir}/man1/rem.1*
+%{_mandir}/man1/%{name}.1*
+
+%files tools
+%doc www/ examples/ contrib/
+%license COPYRIGHT MICROSOFT-AND-APPLE
 %{_bindir}/rem2html
 %{_bindir}/rem2pdf
 %{_bindir}/rem2ps
-%{_bindir}/remind
-%{_mandir}/man1/rem.1.gz
-%{_mandir}/man1/rem2html.1.gz
-%{_mandir}/man1/rem2pdf.1.gz
-%{_mandir}/man1/rem2ps.1.gz
-%{_mandir}/man1/remind.1.gz
-%{_mandir}/man3/Remind::PDF.3pm.gz
-%{_mandir}/man3/Remind::PDF::Entry.3pm.gz
-%{_datadir}/perl5/vendor_perl/Remind/PDF.pm
-%{_datadir}/perl5/vendor_perl/Remind/PDF/Entry.pm
-%{_datadir}/remind/ansitext.rem
-%{_datadir}/remind/holidays/ca.rem
-%{_datadir}/remind/holidays/fr.rem
-%{_datadir}/remind/holidays/gr.rem
-%{_datadir}/remind/holidays/ie.rem
-%{_datadir}/remind/holidays/jewish.rem
-%{_datadir}/remind/holidays/us.rem
-%{_datadir}/remind/lang/auto.rem
-%{_datadir}/remind/lang/da.rem
-%{_datadir}/remind/lang/de.rem
-%{_datadir}/remind/lang/en.rem
-%{_datadir}/remind/lang/es.rem
-%{_datadir}/remind/lang/fi.rem
-%{_datadir}/remind/lang/fr.rem
-%{_datadir}/remind/lang/gr.rem
-%{_datadir}/remind/lang/is.rem
-%{_datadir}/remind/lang/it.rem
-%{_datadir}/remind/lang/nl.rem
-%{_datadir}/remind/lang/no.rem
-%{_datadir}/remind/lang/pl.rem
-%{_datadir}/remind/lang/pt.rem
-%{_datadir}/remind/lang/ro.rem
-%{_datadir}/remind/seasons.rem
-%{_datadir}/remind/site/README
-
-# I don't believe this .packlist should be in the RPM - but I'm no expert
-%exclude %{_libdir}/perl5/vendor_perl/auto/Remind/PDF/.packlist
-
-# I don't believe this is the correct install location, but I'm neither
-# an expert, nor can I currently figure out how to teak things so it
-# would be installed into {_libdir}/perl5/vendor_perl/Remind/rem2pdf.pod
-%exclude %{_libdir}/perl5/perllocal.pod
-
-%doc COPYRIGHT MICROSOFT-AND-APPLE README contrib docs examples www
+%{perl_vendorlib}/*
+%{_mandir}/man1/rem2html.1*
+%{_mandir}/man1/rem2pdf.1*
+%{_mandir}/man1/rem2ps.1*
+%{_mandir}/man3/Remind::PDF.3pm*
+%{_mandir}/man3/Remind::PDF::Entry.3pm*
 
 %files gui
 %{_bindir}/tkremind
-%{_datadir}/applications/tkremind.desktop
-%{_mandir}/man1/tkremind.1.gz
+%{_mandir}/man1/tkremind.1*
 
 %changelog
-* Fri Oct 06 2023 Kurt Keller <kurt@pinboard.jp> - 04.02.06-1
-- tcllib is not automatically required by rpm upon install
-
-* Fri Oct 06 2023 Kurt Keller <kurt@pinboard.jp> - 04.02.06-0
-- Built latest version for Fedora 38
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 03.01.15-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 03.01.15-6
-- Escape macros in %%changelog
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 03.01.15-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 03.01.15-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 03.01.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 03.01.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jul 29 2015 Jaromir Capik <jcapik@redhat.com> - 03.01.15-1
-- Updating to 03.01.15 (#1215295)
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.13-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.13-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.13-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.13-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 03.01.13-4
-- Perl 5.18 rebuild
-
-* Thu Jun 13 2013 Jaromir Capik <jcapik@redhat.com> - 03.01.13-3
-- Fixing unescaped %%check section in the changelog ...
-- ... causing build failures on aarch64
-
-* Wed May 01 2013 Jon Ciesla <limburgher@gmail.com> - 03.01.13-2
-- Drop desktop vendor tag.
-
-* Tue Apr 09 2013 Jaromir Capik <jcapik@redhat.com> - 03.01.13-1
-- Updated to 03.01.13
-- Fixing bogus dates in the changelog
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu May 03 2012 Jaromir Capik <jcapik@redhat.com> - 03.01.12-2
-- fix for #816370 - rem2ps should not require margins to be at least 1/2 inch
-- Patch from Jonathan Kamens
-
-* Mon Apr 30 2012 Jaromir Capik <jcapik@redhat.com> - 03.01.12-1
-- Updated to 03.01.12
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.07-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.07-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.07-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun May 31 2009 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.07-1
-- Upstream released 03.01.07
-
-* Sat Feb 28 2009 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.06-1
-- Latest version refresh
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 03.01.04-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Mar 26 2008 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.04-1
-- Updated to version 03.01.04
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 03.01.02-4
-- Autorebuild for GCC 4.3
-
-* Mon Jan 28 2008 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.02-3
-- Copied rem2html to /usr/bin per bz #430502
-- Using a few more macros in spec file
-
-* Wed Sep 19 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.02-2
-- Added tcllib requires per bz #290761
-
-* Thu Sep 13 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.02-1
-- Updated to version 03.01.02
-
-* Thu Aug 23 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.01-1
-- Updated to version 03.01.01
-- Updated license tag to GPLv2
-
-* Wed Aug 15 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.01.00-1
-- Updated to version 03.01.00
-
-* Wed May 23 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-3
-- Fixed permissions on www/* to be 0644.
-
-* Mon May 07 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-2
-- Added www to documentation.  A sample web application I do not feel is
-  suitable for inclusion into the actual RPM.
-
-* Thu May 03 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-2
-- Using integer only release numbers.
-- Preserve timestamps on manpages.
-- Added %%check
-- Removed README from documentation and added ACKNOWLEDGEMENTS
-
-* Wed Apr 25 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-1.1
-- Applied patch from Dan Young (dyoung@mesd.k12.or.us) to not strip binaries
-  See: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235802#c3
-- Explicitly specifying man pages under %%files to avoid duplication of
-  tkremind.1 across subpackages
-- Added README and COPYRIGHT
-
-* Mon Apr  9 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-1
-- Added .desktop file
-- Initial release
-
-* Mon Apr  9 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-0.5
-- Convert remind.1 to UTF8
-
-* Mon Apr  9 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-0.4
-- Rebuild
-
-* Mon Apr  9 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-0.3
-- Rebuild
-
-* Mon Apr  9 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-0.2
-- Split into -gui sub-package.
-
-* Mon Apr  9 2007 Ray Van Dolson <rayvd@bludgeon.org> - 03.00.24-0.1
-- Initial release.
+%autochangelog

diff --git a/sources b/sources
index 2c27439..709bd9b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-77fb811e8c87aaab748e6ed59a0c3053  remind-04.02.06.tar.gz
+SHA512 (remind-04.02.07.tar.gz) = cfa644fc9532f53a4b0c2566643955a3ce915822ab2fe09ad2ac9dd857dbe15b4738000e1ffab3c5b9b23a368a28236bc61b7560bac07f3967b1bf446bf7f7e3
+SHA512 (remind-04.02.07.tar.gz.sig) = a6cfd33f553fde1d7914169dd4993efb1490692781ab194ee12e4f2fba5f99d1d274ffeb8a95aa894164581e14c289e7949d629a7c91cde417d0e19310644125

diff --git a/tkremind.desktop b/tkremind.desktop
deleted file mode 100644
index 1720c69..0000000
--- a/tkremind.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=tkremind
-GenericName=Remind Tk GUI
-Exec=tkremind
-Terminal=false
-Type=Application
-Categories=Office;

[rpms/remind] epel10: update to eclipseo's work on the spec

[Neil Hanlon]

A new commit has been pushed.

Repo   : rpms/remind
Branch : epel10
Commit : b248e4638af5aa848a264a2ef2c93224689e8090
Author : Neil Hanlon <neil@shrug.pw>
Date   : 2024-02-07T14:10:18+00:00
Stats  : +184/-24 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/remind/c/b248e4638af5aa848a264a2ef2c93224689e8090?branch=epel10

Log:
update to eclipseo's work on the spec

---
diff --git a/685A5A5E511D30E2.gpg b/685A5A5E511D30E2.gpg
new file mode 100644
index 0000000..000ee07
--- /dev/null
+++ b/685A5A5E511D30E2.gpg
@@ -0,0 +1,134 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+2WXg44pivt7i0Jvns/uMfxnGFIykCt8=
+=GIQT
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/remind.spec b/remind.spec
index 74c203d..b2d0a65 100644
--- a/remind.spec
+++ b/remind.spec
@@ -30,9 +30,9 @@ Requires:       tk > 8.0
 Requires:       remind = %{version}-%{release}
 Requires:       tcllib
 
-%description gui
-The remind-gui package contains a (self-described) "cheesy" graphical front
-end for Remind using Tcl/Tk.
+%description    gui
+Tkremind provides a GUI which allows viewing a calendar and adding or editing
+reminders without learning the syntax of Remind.
 
 %prep
 %setup -q
@@ -49,19 +49,7 @@ popd
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
-
-%check
-cd src
-if ! make test; then
-  set +x
-  for f in `find .. -name \*.diff -type f -print`; do
-    echo "TEST FAILURE: $f --"
-    cat "$f"
-    echo "-- $f result ends."
-  done
-  set -x
-fi
+%make_build
 
 %install
 # This preserves timestamps.

diff --git a/tkremind.desktop b/tkremind.desktop
deleted file mode 100644
index 1720c69..0000000
--- a/tkremind.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=tkremind
-GenericName=Remind Tk GUI
-Exec=tkremind
-Terminal=false
-Type=Application
-Categories=Office;

diff --git a/use-system-libjsonparser.diff b/use-system-libjsonparser.diff
new file mode 100644
index 0000000..0b1d93c
--- /dev/null
+++ b/use-system-libjsonparser.diff
@@ -0,0 +1,46 @@
+From: =?utf-8?b?0L3QsNCx?= <nabijaczleweli@gmail.com>
+Date: Tue, 12 May 2020 03:14:11 +0200
+Subject: Use system libjsonparser
+
+---
+ src/Makefile.in | 6 +++---
+ src/rem2ps.c    | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b6283dd..fb04b7b 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -44,8 +44,8 @@ test: all
+ 
+ $(REMINDOBJS): $(REMINDHDRS)
+ 
+-rem2ps: rem2ps.o dynbuf.o json.o
+-	@CC@ @CFLAGS@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o json.o -lm
++rem2ps: rem2ps.o dynbuf.o
++	@CC@ @CFLAGS@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o -ljsonparser -lm
+ 
+ remind: $(REMINDOBJS)
+ 	@CC@ @CFLAGS@ @LDFLAGS@ $(LDEXTRA) -o remind $(REMINDOBJS) @LIBS@
+@@ -78,7 +78,7 @@ clobber:
+ 	rm -f *.o *~ remind rem2ps test.out core *.bak
+ 
+ depend:
+-	gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c json.c
++	gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c
+ 
+ # The next targets are not very useful to you.  I use them to build
+ # distributions, etc.
+diff --git a/src/rem2ps.c b/src/rem2ps.c
+index de97baf..a46a676 100644
+--- a/src/rem2ps.c
++++ b/src/rem2ps.c
+@@ -21,7 +21,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include "rem2ps.h"
+-#include "json.h"
++#include "json-parser/json.h"
+ 
+ #define NEW(type) (malloc(sizeof(type)))
+