3.0-32: fix typos - #1626689

words-3.0-typos.patch

@@ -1,7 +1,23 @@
-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
+diff -up words-3.0/mwords/256772co.mpo.typos words-3.0/mwords/256772co.mpo
+--- words-3.0/mwords/256772co.mpo.typos	1996-06-06 05:33:56.000000000 +0200
++++ words-3.0/mwords/256772co.mpo	2019-01-08 13:10:03.346213801 +0100
+@@ -90189,7 +90189,6 @@ Ultra-byronism
+ Ultra-calvinist
+ Ultra-christian
+ Ultra-english
+-Ultra-englishUltra-french
+ Ultra-french
+ Ultra-gallican
+ Ultra-gangetic
+@@ -116323,7 +116322,6 @@ by-day
+ by-dependency
+ by-design
+ by-doing
+-by-doingby-drinking
+ by-drinking
+ by-dweller
+ by-effect
+@@ -155743,7 +155741,8 @@ half-eaten
  half-ebb
  half-educated
  half-embraced
@@ -11,9 +27,25 @@ diff -up words-3.0/mwords/256772co.mpo.kzak words-3.0/mwords/256772co.mpo
  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	2018-09-10 11:47:49.592525879 +0200
+@@ -208469,7 +208468,6 @@ rude-looking
+ rude-made
+ rude-mannered
+ rude-spoken
+-rude-spokenrude-spun
+ rude-spun
+ rude-thoughted
+ rude-tongued
+@@ -251103,7 +251101,6 @@ what-is-it
+ what-like
+ what-you-call-it
+ what-you-may call-it
+-what-you-may--call-it
+ what-you-may-call-'em
+ whatever comes
+ whatever may happen
+diff -up words-3.0/mwords/354984si.ngl.typos words-3.0/mwords/354984si.ngl
+--- words-3.0/mwords/354984si.ngl.typos	1996-06-06 05:30:48.000000000 +0200
++++ words-3.0/mwords/354984si.ngl	2019-01-08 13:06:25.581693153 +0100
 @@ -17787,7 +17787,6 @@ architecture
  architecture's
  architectures

words.spec

@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 # Note that Moby Project officially does not exist any more. The most complete
@@ -17,6 +17,7 @@ BuildRequires: grep
 #440146 - misspelled word in /usr/share/dict/words (architecure)
 #457309 - contains both 'unnecessary' and 'unneccesary'
 #1626689 - linux.words contains "half-embracinghalf-embracingly"
+#1652919 - malformed entry in words file
 Patch0: words-3.0-typos.patch
 #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
 Patch1: words-3.0-presidents.patch
@@ -29,8 +30,8 @@ passwords.
 
 %prep
 %setup -q -c
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .typos
+%patch1 -p1 -b .presidents
 
 %build
 cd mwords
@@ -75,6 +76,9 @@ ln -sf linux.words $RPM_BUILD_ROOT%{_datadir}/dict/words
 %{_datadir}/dict/words
 
 %changelog
+* Tue Jan  8 2019 Karel Zak <kzak@redhat.com> - 3.0-32
+- fix #1652919 - malformed entry in words file
+
 * Mon Sep 10 2018 Karel Zak <kzak@redhat.com> - 3.0-31
 - #1626689 - linux.words contains "half-embracinghalf-embracingly"
 - add Donald Trump between presidents