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 99b2b14..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 $$/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/changelog b/changelog new file mode 100644 index 0000000..53a7d59 --- /dev/null +++ b/changelog @@ -0,0 +1,192 @@ +* Sat Jul 22 2023 Fedora Release Engineering - 3.0-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed May 24 2023 Karel Zak - 3.0-43 +- spec file cleanup (based on PR from Robert Scheck) + +* Tue Apr 25 2023 Lukáš Zaoral - 3.0-42 +- migrate to SPDX license format + +* Sat Jan 21 2023 Fedora Release Engineering - 3.0-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.0-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.0-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.0-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 3.0-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3.0-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 8 2019 Karel Zak - 3.0-32 +- fix #1652919 - malformed entry in words file + +* Mon Sep 10 2018 Karel Zak - 3.0-31 +- #1626689 - linux.words contains "half-embracinghalf-embracingly" +- add Donald Trump between presidents + +* Wed Aug 1 2018 Karel Zak - 3.0-30 +- remove BuildRoot tag + +* Sat Jul 14 2018 Fedora Release Engineering - 3.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 3.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 3.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 3.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 3.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 3.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 3.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 3.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Feb 23 2012 Karel Zak - 3.0-19 +- fix #746416 - words contains "unltraconservative" + +* Sat Jan 14 2012 Fedora Release Engineering - 3.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 3.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jul 27 2009 Fedora Release Engineering - 3.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 3.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jan 12 2009 Karel Zak - 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 - 3.0-13 +- fix #428582 - linux.words contains misspelled word "flourescent" +- fix #440146 - misspelled word in /usr/share/dict/words (architecure) + +* Mon Apr 2 2007 Karel Zak - 3.0-12 +- fix #226542 - Merge Review: words + +* Mon Apr 2 2007 Karel Zak - 3.0-11 +- cleanup spec file +- fix #227216 - Unnecessary BuildRequirement to ncompress + +* Wed Jan 24 2007 Karel Zak - 3.0-10 +- fix regex that removes possessives ('s) + +* Wed Jul 19 2006 Karel Zak - 3.0-9 +- rebuild + +* Wed Jul 12 2006 Jesse Keating - 3.0-8.1.1 +- rebuild + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 21 2005 Karel Zak 3-8 +- rebuilt + +* Mon May 2 2005 Karel Zak 3-7 +- sort with --dictionary-order +- remove words with possessives ('s) + +* Mon Apr 4 2005 Karel Zak 3-6 +- fix uniq command usage + +* Tue Mar 29 2005 Karel Zak 3-5 +- replace word list with much better Moby Project words list (#61395) +- revise %%description; ispell/aspell no longer uses words + +* Mon Sep 27 2004 Adrian Havill 2-23 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Feb 5 2003 Nalin Dahyabhai 2-21 +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Apr 3 2002 Trond Eivind Glomsrod 2-18 +- Bump. + +* Mon Mar 18 2002 Trond Eivind Glomsrod 2-17 +- s/Copyright/License/ +- add gullible and facetious (#60166, #60173) + +* Fri Apr 6 2001 Trond Eivind Glomsrod +- Add carnivore (#35031) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jun 13 2000 Trond Eivind Glomsrod +- use %%{_tmppath} + +* Thu Apr 13 2000 Nalin Dahyabhai +- add some words: some food additives, dinosaurs, atmospheric terms + +* Fri Apr 07 2000 Trond Eivind Glomsrod +- update description +- moved it to /usr/share/dict +- updated URL + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 12) + +* Wed Sep 30 1998 Bill Nottingham +- take out extra.words (they're all in linux.words) + +* Sun Aug 23 1998 Jeff Johnson +- correct desiccate (problem #794) + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Tue Oct 21 1997 Donnie Barnes +- spec file cleanups + +* Tue Sep 23 1997 Erik Troan +- made a noarch package diff --git a/words-3.0-presidents.patch b/words-3.0-presidents.patch new file mode 100644 index 0000000..d4b7f29 --- /dev/null +++ b/words-3.0-presidents.patch @@ -0,0 +1,92 @@ +diff -up mwords/70presid.nam.kzak mwords/70presid.nam +--- mwords/70presid.nam.kzak 2018-09-10 12:12:09.210563662 +0200 ++++ mwords/70presid.nam 2018-09-10 12:13:15.016159073 +0200 +@@ -0,0 +1,74 @@ ++Abraham ++Adams ++Andrew ++Arthur ++Barack ++Benjamin ++Biden ++Bill ++Buchanan ++Buren ++Bush ++Calvin ++Carter ++Chester ++Cleveland ++Clinton ++Coolidge ++Donald ++Dwight ++Eisenhower ++Fillmore ++Ford ++Franklin ++Garfield ++George ++Gerald ++Grant ++Grover ++Harding ++Harrison ++Harry ++Hayes ++Herbert ++Hoover ++Jackson ++James ++Jefferson ++Jimmy ++Joe ++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 ++Trump ++Tyler ++Ulysses ++Van ++Warren ++Washington ++William ++Wilson ++Woodrow ++Zachary +diff -up mwords/readme.txt.kzak mwords/readme.txt +--- mwords/readme.txt.kzak 1993-08-26 02:47:14.000000000 +0200 ++++ mwords/readme.txt 2018-09-10 12:12:09.210563662 +0200 +@@ -119,6 +121,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 2024). 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..1eb77f9 100644 --- a/words-3.0-typos.patch +++ b/words-3.0-typos.patch @@ -1,7 +1,64 @@ -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 +diff -up mwords/113809of.fic.kzak mwords/113809of.fic +--- mwords/113809of.fic.kzak 2024-09-10 13:56:34.435114961 +0200 ++++ mwords/113809of.fic 2024-09-10 13:58:53.522351783 +0200 +@@ -19561,8 +19561,6 @@ compassing + compassion + compassionate + compassions +-compatability +-compatable + compatibilities + compatibility + compatible +diff -up mwords/256772co.mpo.kzak mwords/256772co.mpo +--- mwords/256772co.mpo.kzak 1996-06-06 05:33:56.000000000 +0200 ++++ mwords/256772co.mpo 2024-09-10 13:50:59.794951154 +0200 +@@ -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 +-half-embracinghalf-embracingly ++half-embracing ++half-embracingly + half-enamored + half-enforced + half-erased +@@ -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 mwords/354984si.ngl.kzak mwords/354984si.ngl +--- mwords/354984si.ngl.kzak 1996-06-06 05:30:48.000000000 +0200 ++++ mwords/354984si.ngl 2024-09-10 13:59:57.956998224 +0200 +@@ -17787,7 +17787,6 @@ architecture architecture's architectures architecturesque @@ -9,7 +66,7 @@ diff -up words-3.0/mwords/354984si.ngl.kzak words-3.0/mwords/354984si.ngl architis architraval architrave -@@ -110139,7 +110138,6 @@ flounderingly +@@ -110139,7 +110138,6 @@ flounderingly flounders flour floured @@ -17,3 +74,42 @@ diff -up words-3.0/mwords/354984si.ngl.kzak words-3.0/mwords/354984si.ngl flouriness flouring flourish +@@ -159510,13 +159508,13 @@ lang + langaha + langarai + langate +-langauge + langbanite + langbeinite + langca + langeel + langel + langi ++language + langiel + langite + langka +@@ -271677,7 +271675,6 @@ sensibilia + sensibilisin + sensibilities + sensibilitist +-sensibilitiy + sensibilitous + sensibility + sensibilium +@@ -330243,7 +330240,6 @@ unlowly + unloyal + unloyally + unloyalty +-unltraconservative + unlubricant + unlubricated + unlubricating +@@ -331241,7 +331237,6 @@ unneath + unneatly + unneatness + unnebulous +-unneccessary + unnecessaries + unnecessarily + unnecessariness diff --git a/words.spec b/words.spec index e79c00e..35524c7 100644 --- a/words.spec +++ b/words.spec @@ -1,24 +1,29 @@ -Summary: A dictionary of English words for the /usr/share/dict directory +Summary: Dictionary of English words for the /usr/share/dict directory Name: words Version: 3.0 -Release: 13%{?dist} -License: Public Domain -Group: System Environment/Libraries -Source: mwords.tar.Z +Release: %autorelease + +# https://gitlab.com/fedora/legal/fedora-license-data/-/commit/1fe1c5769b177e00749a324557f6631a964770b1 +License: LicenseRef-Fedora-Public-Domain + # 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 +URL: https://en.wikipedia.org/wiki/Moby_Project +Source: https://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' +#1626689 - linux.words contains "half-embracinghalf-embracingly" +#1652919 - malformed entry in words file +#2294822 - Misspelled words in /usr/share/dict/words 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,15 +31,12 @@ 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 +%autosetup -p1 -n mwords %build -cd mwords dos2unix -o *; chmod a+r * -cat [1-9]*.??? | egrep --invert-match "'s$" | egrep "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby +cat [1-9]*.??? | grep -E --invert-match "'s$" | grep -E "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby cat <license.txt *** @@ -63,114 +65,14 @@ daedal@myrealbox.com EOF %install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_datadir}/dict -install -m644 mwords/moby $RPM_BUILD_ROOT%{_datadir}/dict/linux.words +install -D -m644 moby $RPM_BUILD_ROOT%{_datadir}/dict/linux.words ln -sf linux.words $RPM_BUILD_ROOT%{_datadir}/dict/words -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) -%doc mwords/readme.txt mwords/license.txt +%license license.txt +%doc readme.txt %{_datadir}/dict/linux.words %{_datadir}/dict/words %changelog -* 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) - -* Mon Apr 2 2007 Karel Zak - 3.0-12 -- fix #226542 - Merge Review: words - -* Mon Apr 2 2007 Karel Zak - 3.0-11 -- cleanup spec file -- fix #227216 - Unnecessary BuildRequirement to ncompress - -* Wed Jan 24 2007 Karel Zak - 3.0-10 -- fix regex that removes possessives ('s) - -* Wed Jul 19 2006 Karel Zak - 3.0-9 -- rebuild - -* Wed Jul 12 2006 Jesse Keating - 3.0-8.1.1 -- rebuild - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Mon Nov 21 2005 Karel Zak 3-8 -- rebuilt - -* Mon May 2 2005 Karel Zak 3-7 -- sort with --dictionary-order -- remove words with possessives ('s) - -* Mon Apr 4 2005 Karel Zak 3-6 -- fix uniq command usage - -* Tue Mar 29 2005 Karel Zak 3-5 -- replace word list with much better Moby Project words list (#61395) -- revise %%description; ispell/aspell no longer uses words - -* Mon Sep 27 2004 Adrian Havill 2-23 -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Wed Feb 5 2003 Nalin Dahyabhai 2-21 -- rebuild - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Wed Apr 3 2002 Trond Eivind Glomsrod 2-18 -- Bump. - -* Mon Mar 18 2002 Trond Eivind Glomsrod 2-17 -- s/Copyright/License/ -- add gullible and facetious (#60166, #60173) - -* Fri Apr 6 2001 Trond Eivind Glomsrod -- Add carnivore (#35031) - -* Thu Jul 13 2000 Prospector -- automatic rebuild - -* Tue Jun 13 2000 Trond Eivind Glomsrod -- use %%{_tmppath} - -* Thu Apr 13 2000 Nalin Dahyabhai -- add some words: some food additives, dinosaurs, atmospheric terms - -* Fri Apr 07 2000 Trond Eivind Glomsrod -- update description -- moved it to /usr/share/dict -- updated URL - -* Sun Mar 21 1999 Cristian Gafton -- auto rebuild in the new build environment (release 12) - -* Wed Sep 30 1998 Bill Nottingham -- take out extra.words (they're all in linux.words) - -* Sun Aug 23 1998 Jeff Johnson -- correct desiccate (problem #794) - -* Tue Aug 11 1998 Jeff Johnson -- build root - -* Mon Apr 27 1998 Prospector System -- translations modified for de, fr, tr - -* Tue Oct 21 1997 Donnie Barnes -- spec file cleanups - -* Tue Sep 23 1997 Erik Troan -- made a noarch package +%autochangelog