From 32350c9b9fd90bef1b90d25659bbb56ab569dedf Mon Sep 17 00:00:00 2001
From: Ben Cotton <bcotton@fedoraproject.org>
Date: Tue, 29 Sep 2020 08:18:15 -0400
Subject: [PATCH 1/2] Change the ncurses dependency to ncurses-libs

This reflects a change in ncurses packaging:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/M7H55IH24L7POGEKSZPQEYRMRJZGVG3V/
---
 wordgrinder.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wordgrinder.spec b/wordgrinder.spec
index dffaf24..fed7718 100644
--- a/wordgrinder.spec
+++ b/wordgrinder.spec
@@ -1,6 +1,6 @@
 Name:           wordgrinder
 Version:        0.7.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A command line word processor
 
 License:        MIT
@@ -11,7 +11,7 @@ Source:         https://github.com/davidgiven/%{name}/archive/%{name}-%{version}
 BuildRequires:  gcc make ncurses-devel ninja-build
 BuildRequires:  lua-devel lua-libs lua lua-filesystem
 BuildRequires:  zlib-devel libXft-devel
-Requires:       ncurses lua-filesystem
+Requires:       ncurses-libs lua-filesystem
 # luaJIT is not available on all architectures
 #ExcludeArch:   s390x ppc64 ppc64le
 
@@ -59,6 +59,9 @@ make install PREFIX=$RPM_BUILD_ROOT/%{_prefix}
 %_bindir/xwordgrinder
 ###############################################################################
 %changelog
+* Tue Sep 29 2020 Ben Cotton <bcotton@fedoraproject.org> - 0.7.2-6
+- Change ncurses dependency to be more specific
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From e1a5e471b2f6a75ba80fe29b60c36502b164369d Mon Sep 17 00:00:00 2001
From: Ben Cotton <bcotton@fedoraproject.org>
Date: Tue, 27 Oct 2020 09:24:48 -0400
Subject: [PATCH 2/2] Update to version 0.8

---
 .gitignore       |  1 +
 sources          |  2 +-
 wordgrinder.spec | 36 +++++++++++++++++++++++++++++++-----
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d68ffc..a865852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /wordgrinder-0.6.tar.gz
 /wordgrinder-0.7.1.tar.gz
 /wordgrinder-0.7.2.tar.gz
+/wordgrinder-0.8.tar.gz
diff --git a/sources b/sources
index 11fe0d7..abf2ed7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordgrinder-0.7.2.tar.gz) = abf3fbeec25e557c780af9b633634d22214e20ae56aebe6574c97ba3d5e8d1adc985329ecf7930370f644d9762d064fb99ac8b64a5c95fa8e5ac6e14627f4d23
+SHA512 (wordgrinder-0.8.tar.gz) = 192e21381dc7644ca1682fe2c5984f97675c7727b84971559625c4a30da28699164d62168022f9de76ec3250ecab32e65a720585c19c2105685d79c8c33a4d2b
diff --git a/wordgrinder.spec b/wordgrinder.spec
index fed7718..4b27791 100644
--- a/wordgrinder.spec
+++ b/wordgrinder.spec
@@ -1,6 +1,6 @@
 Name:           wordgrinder
-Version:        0.7.2
-Release:        6%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        A command line word processor
 
 License:        MIT
@@ -12,8 +12,6 @@ BuildRequires:  gcc make ncurses-devel ninja-build
 BuildRequires:  lua-devel lua-libs lua lua-filesystem
 BuildRequires:  zlib-devel libXft-devel
 Requires:       ncurses-libs lua-filesystem
-# luaJIT is not available on all architectures
-#ExcludeArch:   s390x ppc64 ppc64le
 
 %description
 WordGrinder is a Unicode-aware character cell word processor that runs in a
@@ -45,7 +43,26 @@ CFLAGS=-g PREFIX=$RPM_BUILD_ROOT/%{_prefix} OBJDIR=$RPM_BUILD_ROOT/tmp WANT_STRI
 %install
 
 make install PREFIX=$RPM_BUILD_ROOT/%{_prefix}
-#make install
+install -D -m 0644 %{_builddir}/%{name}-%{version}/extras/wordgrinder.desktop %{buildroot}%{_datadir}/applications/wordgrinder.desktop
+
+###############################################################################
+%post x11
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &>/dev/null || :
+
+%postun x11
+update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    update-mime-database %{_datadir}/mime &> /dev/null || :
+fi
+
+%posttrans x11
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
 
 ###############################################################################
 %files
@@ -57,8 +74,17 @@ make install PREFIX=$RPM_BUILD_ROOT/%{_prefix}
 %files x11
 %license licenses/COPYING.WordGrinder
 %_bindir/xwordgrinder
+%_mandir/man1/xwordgrinder.1*
+%{_datadir}/applications/wordgrinder.desktop
+%{_datadir}/pixmaps/wordgrinder.png
+%{_datadir}/mime-info/wordgrinder.mime
+
 ###############################################################################
 %changelog
+* Tue Oct 27 2020 Ben Cotton <bcotton@fedoraproject.org> - 0.8-1
+- Update to version 0.8
+- Make wordgrinder-x11 package standalone
+
 * Tue Sep 29 2020 Ben Cotton <bcotton@fedoraproject.org> - 0.7.2-6
 - Change ncurses dependency to be more specific