From 0cad96b507c23f94848093dbb83cfa905b2fc6da Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:14:52 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for words --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From a8bdf211581f22492a1756448ccab483f51a2a01 Mon Sep 17 00:00:00 2001 From: kzak Date: Mon, 12 Jan 2009 12:48:56 +0000 Subject: [PATCH 2/4] - fix #457309 - contains both 'unnecessary' and 'unneccesary' - fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words --- words-3.0-presidents.patch | 88 ++++++++++++++++++++++++++++++++++++++ words.spec | 11 ++++- 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 words-3.0-presidents.patch 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.spec b/words.spec index e79c00e..bbda984 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: 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 - 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 - 3.0-13 - fix #428582 - linux.words contains misspelled word "flourescent" - fix #440146 - misspelled word in /usr/share/dict/words (architecure) From 49c3648f64c26e3f41468f87ccbfb3f861453f44 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:17 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 99b2b14..091fef3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From cc33bfd26a8c751f43d09d65d93f65855b0b49f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:24:23 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 091fef3..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10