From fde7097461b40d3e87741cfa0b0360a02ffef12e Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Sep 10 2018 10:20:57 +0000
Subject: 3.0-31: fix half-embracing, add D.Trump


Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1626689

---

diff --git a/words-3.0-presidents.patch b/words-3.0-presidents.patch
index 88b2564..840ffd4 100644
--- a/words-3.0-presidents.patch
+++ b/words-3.0-presidents.patch
@@ -1,7 +1,7 @@
-diff -up /dev/null words-3.0/mwords/70presid.nam
---- /dev/null	2009-01-07 09:15:55.031018896 +0100
-+++ words-3.0/mwords/70presid.nam	2009-01-12 12:22:46.000000000 +0100
-@@ -0,0 +1,70 @@
+diff -up words-3.0/mwords/70presid.nam.kzak words-3.0/mwords/70presid.nam
+--- words-3.0/mwords/70presid.nam.kzak	2018-09-10 12:12:09.210563662 +0200
++++ words-3.0/mwords/70presid.nam	2018-09-10 12:13:15.016159073 +0200
+@@ -0,0 +1,72 @@
 +Abraham
 +Adams
 +Andrew
@@ -18,6 +18,7 @@ diff -up /dev/null words-3.0/mwords/70presid.nam
 +Cleveland
 +Clinton
 +Coolidge
++Donald
 +Dwight
 +Eisenhower
 +Fillmore
@@ -63,6 +64,7 @@ diff -up /dev/null words-3.0/mwords/70presid.nam
 +Theodore
 +Thomas
 +Truman
++Trump
 +Tyler
 +Ulysses
 +Van
@@ -73,8 +75,8 @@ diff -up /dev/null words-3.0/mwords/70presid.nam
 +Woodrow
 +Zachary
 diff -up words-3.0/mwords/readme.txt.kzak words-3.0/mwords/readme.txt
---- words-3.0/mwords/readme.txt.kzak	2009-01-12 12:28:41.000000000 +0100
-+++ words-3.0/mwords/readme.txt	2009-01-12 12:28:24.000000000 +0100
+--- words-3.0/mwords/readme.txt.kzak	1993-08-26 02:47:14.000000000 +0200
++++ words-3.0/mwords/readme.txt	2018-09-10 12:12:09.210563662 +0200
 @@ -119,6 +119,10 @@ Version Bible ranked and counted by orde
  The most frequently occurring 467 substrings occurring in a
  best-selling novel by Amy Tan in 1990.
diff --git a/words-3.0-typos.patch b/words-3.0-typos.patch
index 30bf035..e1fe16b 100644
--- a/words-3.0-typos.patch
+++ b/words-3.0-typos.patch
@@ -1,6 +1,19 @@
+diff -up words-3.0/mwords/256772co.mpo.kzak words-3.0/mwords/256772co.mpo
+--- words-3.0/mwords/256772co.mpo.kzak	2018-09-10 11:51:11.258289728 +0200
++++ words-3.0/mwords/256772co.mpo	2018-09-10 11:51:49.628054533 +0200
+@@ -155743,7 +155743,8 @@ half-eaten
+ half-ebb
+ half-educated
+ half-embraced
+-half-embracinghalf-embracingly
++half-embracing
++half-embracingly
+ half-enamored
+ half-enforced
+ half-erased
 diff -up words-3.0/mwords/354984si.ngl.kzak words-3.0/mwords/354984si.ngl
 --- words-3.0/mwords/354984si.ngl.kzak	1996-06-06 05:30:48.000000000 +0200
-+++ words-3.0/mwords/354984si.ngl	2012-02-23 16:13:16.442199825 +0100
++++ words-3.0/mwords/354984si.ngl	2018-09-10 11:47:49.592525879 +0200
 @@ -17787,7 +17787,6 @@ architecture
  architecture's
  architectures
diff --git a/words.spec b/words.spec
index 29b764c..2a30aa3 100644
--- a/words.spec
+++ b/words.spec
@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 # Note that Moby Project officially does not exist any more. The most complete
@@ -16,6 +16,7 @@ BuildRequires: grep
 #428582 - linux.words contains misspelled word "flourescent"
 #440146 - misspelled word in /usr/share/dict/words (architecure)
 #457309 - contains both 'unnecessary' and 'unneccesary'
+#1626689 - linux.words contains "half-embracinghalf-embracingly"
 Patch0: words-3.0-typos.patch
 #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
 Patch1: words-3.0-presidents.patch
@@ -74,6 +75,10 @@ ln -sf linux.words $RPM_BUILD_ROOT%{_datadir}/dict/words
 %{_datadir}/dict/words
 
 %changelog
+* Mon Sep 10 2018 Karel Zak <kzak@redhat.com> - 3.0-31
+- #1626689 - linux.words contains "half-embracinghalf-embracingly"
+- add Donald Trump between presidents
+
 * Wed Aug  1 2018 Karel Zak <kzak@redhat.com> - 3.0-30
 - remove BuildRoot tag