From 66a784e915462650e42af055515a6dddb8d91095 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Jan 12 2009 12:21:02 +0000
Subject: - fix #457309 - contains both 'unnecessary' and 'unneccesary'

- fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
- update spec file (#226542 - Merge Review)

---

diff --git a/words-3.0-presidents.patch b/words-3.0-presidents.patch
new file mode 100644
index 0000000..88b2564
--- /dev/null
+++ b/words-3.0-presidents.patch
@@ -0,0 +1,88 @@
+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 @@
++Abraham
++Adams
++Andrew
++Arthur
++Barack
++Benjamin
++Bill
++Buchanan
++Buren
++Bush
++Calvin
++Carter
++Chester
++Cleveland
++Clinton
++Coolidge
++Dwight
++Eisenhower
++Fillmore
++Ford
++Franklin
++Garfield
++George
++Gerald
++Grant
++Grover
++Harding
++Harrison
++Harry
++Hayes
++Herbert
++Hoover
++Jackson
++James
++Jefferson
++Jimmy
++John
++Johnson
++Kennedy
++Lincoln
++Lyndon
++Madison
++Martin
++McKinley
++Millard
++Monroe
++Nixon
++Obama
++Pierce
++Polk
++Quincy
++Reagan
++Richard
++Ronald
++Roosevelt
++Rutherford
++Taft
++Taylor
++Theodore
++Thomas
++Truman
++Tyler
++Ulysses
++Van
++Warren
++Washington
++William
++Wilson
++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
+@@ -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.
+ 
++70 names of presidents
++This file consists of the 70 names (first and last names) or American
++presidents (to 2009). Added by Karel Zak for Fedora Linux distribution.
++
+ USA Constitution
+ The Constitution of the United States, including the Bill of Rights
+ and all amendments current to 1993.
diff --git a/words-3.0-typos.patch b/words-3.0-typos.patch
index edc6291..6faaec6 100644
--- a/words-3.0-typos.patch
+++ b/words-3.0-typos.patch
@@ -1,6 +1,6 @@
 diff -up words-3.0/mwords/354984si.ngl.kzak words-3.0/mwords/354984si.ngl
---- words-3.0/mwords/354984si.ngl.kzak	2008-06-23 14:00:07.000000000 +0200
-+++ words-3.0/mwords/354984si.ngl	2008-06-23 14:02:54.000000000 +0200
+--- words-3.0/mwords/354984si.ngl.kzak	1996-06-06 05:30:48.000000000 +0200
++++ words-3.0/mwords/354984si.ngl	2009-01-12 11:56:54.000000000 +0100
 @@ -17787,7 +17787,6 @@ architecture
  architecture's
  architectures
@@ -17,3 +17,11 @@ diff -up words-3.0/mwords/354984si.ngl.kzak words-3.0/mwords/354984si.ngl
  flouriness
  flouring
  flourish
+@@ -331241,7 +331239,6 @@ unneath
+ unneatly
+ unneatness
+ unnebulous
+-unneccessary
+ unnecessaries
+ unnecessarily
+ unnecessariness
diff --git a/words.spec b/words.spec
index e79c00e..10c92d9 100644
--- a/words.spec
+++ b/words.spec
@@ -1,24 +1,26 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
-Source: mwords.tar.Z
 # Note that Moby Project officially does not exist any more. The most complete
 # information about the project is in Wikipedia.
 URL: http://en.wikipedia.org/wiki/Moby_Project
+Source: http://web.archive.org/web/20060527013227/http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
 
 BuildArch: noarch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dos2unix
 BuildRequires: grep
-BuildRequires: coreutils
 
 #428582 - linux.words contains misspelled word "flourescent"
 #440146 - misspelled word in /usr/share/dict/words (architecure)
+#457309 - contains both 'unnecessary' and 'unneccesary'
 Patch0: words-3.0-typos.patch
+#470921 -"Barack" and "Obama" are not in /usr/share/dict/words
+Patch1: words-3.0-presidents.patch
 
 %description
 The words file is a dictionary of English words for the
@@ -26,10 +28,10 @@ The words file is a dictionary of English words for the
 words to check spelling. Password checkers use it to look for bad
 passwords.
 
-
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1 -b .kzak
 
 %build
 cd mwords
@@ -78,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dict/words
 
 %changelog
+* Mon Jan 12 2009 Karel Zak <kzak@redhat.com> - 3.0-14
+- fix #457309 - contains both 'unnecessary' and 'unneccesary'
+- fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
+- update spec file (#226542 - Merge Review)
+
 * Mon Jun 23 2008 Karel Zak <kzak@redhat.com> - 3.0-13
 - fix #428582 - linux.words contains misspelled word "flourescent"
 - fix #440146 - misspelled word in /usr/share/dict/words (architecure)