dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: words
-# $Id$
-NAME := words
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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.

words.spec

@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 13%{?dist}
+Release: 13.1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: mwords.tar.Z
@@ -18,7 +18,10 @@ 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 +29,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
 
 %build
 cd mwords
@@ -78,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dict/words
 
 %changelog
+* Mon Jan 12 2009 Karel Zak <kzak@redhat.com> - 3.0-13.1
+- fix #457309 - contains both 'unnecessary' and 'unneccesary'
+- fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
+
 * 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)