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-typos.patch

@@ -0,0 +1,19 @@
+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
+@@ -17787,7 +17787,6 @@ architecture
+ architecture's
+ architectures
+ architecturesque
+-architecure
+ architis
+ architraval
+ architrave
+@@ -110139,7 +110138,6 @@ flounderingly
+ flounders
+ flour
+ floured
+-flourescent
+ flouriness
+ flouring
+ flourish

words.spec

@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 12%{?dist}
+Release: 12.1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
@@ -14,6 +14,10 @@ BuildRequires: dos2unix
 BuildRequires: grep
 BuildRequires: coreutils
 
+#428582 - linux.words contains misspelled word "flourescent"
+#440146 - misspelled word in /usr/share/dict/words (architecure)
+Patch0: words-3.0-typos.patch
+
 %description
 The words file is a dictionary of English words for the
 /usr/share/dict directory. Some programs use this database of
@@ -22,6 +26,7 @@ passwords.
 
 %prep
 %setup -q -c
+%patch0 -p1
 
 %build
 cd mwords
@@ -70,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dict/words
 
 %changelog
+* Mon Jun 23 2008 Karel Zak <kzak@redhat.com> - 3.0-12.1
+- fix #428582 - linux.words contains misspelled word "flourescent"
+- fix #440146 - misspelled word in /usr/share/dict/words (architecure)
+
 * Mon Apr  2 2007 Karel Zak <kzak@redhat.com> - 3.0-12
 - fix #226542 - Merge Review: words