Hello community, here is the log from the commit of package words for openSUSE:Factory checked in at Tue Jun 14 10:53:36 CEST 2011.
-------- --- words/words.changes 2007-07-26 13:02:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/words/words.changes 2011-06-09 22:57:11.000000000 +0200 @@ -1,0 +2,34 @@ +Thu Jun 9 20:15:29 UTC 2011 - [email protected] + +- Update to version 7.1: + * Updated to revision 5.1 of Varcon which corrected several errors. + * Fixed various problems with the variant processing which corrected a few + more errors. + * Added several now common proper names and some other words now in common + use. + * Include misc/ and speller/ directory which where in SVN but left out of the + release tarball. + * Other minor fixes, including some fixes to the taboo word lists. + From version 7: + * Updated to revision 5.0 of Varcon which corrected many errors, especially + in the British and Canadian spelling categories. Also added new spelling + categories for the British and Canadian spelling variants and separated + them out from the main variant_* categories. + * Moved Moby names lists (3897male.nam 4946fema.len 21986na.mes) to 95 level + since they contain too many errors and rare names. + * Moved frequently class 0 from Brian Kelk's Wordlist from level 60 to 70, + and also filter it with level 80 due to, too many misspellings. + * Many other minor fixes. +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Changed Group: to Productivity/Office/Dictionary. + * Simplified the %build section since the package now provides a build + script. + * Minor other updates. + * Removed %changelog entries. +- Removed scowl-6.dif patch (fixed in new version). +- Improvements in SuSEconfig.words to support all combinations of installed + dictionaries. +- Improvements in sysconfig.words (replaced ispell references with words). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- scowl-6.dif scowl-6.tar.gz New: ---- scowl-7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ words.spec ++++++ --- /var/tmp/diff_new_pack.mBWV4m/_old 2011-06-14 10:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.mBWV4m/_new 2011-06-14 10:44:11.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package words (Version 6) +# spec file for package words # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,173 +19,80 @@ Name: words -License: Public Domain, Freeware -Group: Productivity/Text/Utilities -AutoReqProv: on -PreReq: %fillup_prereq -Version: 6 -Release: 143 +Version: 7.1 +Release: 1 Summary: An English words dictionary + +License: Public Domain, Freeware Url: http://wordlist.sourceforge.net/ -Source: http://prdownloads.sourceforge.net/wordlist/scowl-6.tar.gz +Group: Productivity/Office/Dictionary +Source0: http://prdownloads.sourceforge.net/wordlist/scowl-7.1.tar.gz Source1: sysconfig.words Source2: SuSEconfig.words -Patch: scowl-6.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build + +PreReq: %fillup_prereq +Provides: scowl = %{version}-%{release} BuildArch: noarch %description -This packages contains an English words dictionary which will be -installed as +This packages contains an English words dictionary which will be installed as /usr/share/dict/american and linked to /usr/share/dict/words -The symbolic link may be used by look(1) and ispell(1). For a British -or Canadian version of such a words dictionary you may install -words-british respectively words-canadian. - +The symbolic link may be used by look(1) and ispell(1). - -Authors: --------- - Kevin Atkinson <[email protected]> +For a British or Canadian version of such a words dictionary you may install +words-british or words-canadian respectively. %package -n words-british License: Public Domain, Freeware -Requires: words Summary: A British words dictionary Group: Productivity/Text/Utilities -AutoReqProv: on +Requires: words %description -n words-british -This packages contains an British words dictionary which will be -installed as +This packages contains an British words dictionary which will be installed as /usr/share/dict/british -for a description see the package words. - - - -Authors: --------- - Kevin Atkinson <[email protected]> +For a description see the package words. %package -n words-canadian License: Public Domain, Freeware -Requires: words Summary: A Canadian words dictionary Group: Productivity/Text/Utilities -AutoReqProv: on +Requires: words %description -n words-canadian -This packages contains an Canadian words dictionary which will be -installed as +This packages contains an Canadian words dictionary which will be installed as /usr/share/dict/canadian -for a description see the package words. - - - -Authors: --------- - Kevin Atkinson <[email protected]> +For a description see the package words. %prep -%setup -n scowl-6 -%patch +%setup -q -n scowl-%{version} %build -test -d working/ || mkdir working -test -d l/ || tar xf l.tar test -d result/ || mkdir result -# -# We use named pipes herein -# -set +o posix -# -# Size is one of 10, 20, 35 (small), -# 40, 50 (medium), 55, 60, 70 (large), -# 80 (huge), 95 (insane) -# -#sizeext="10 20 35 40 50 55 60 70 80 95" -sizeext="10 20 35 40 50 55 60 70 80" -#sizeext="10 20 35 40 50 55 60 70" -# -# We support those three english spellings -# -spellings="american - british - canadian - " -# -# All classes -# -classes="abbreviations - contractions - hacker - proper-names - roman-numerals - upper - words - " -# -# All variants -# -variants="0 1 2" -LANG=POSIX -export POSIX -for s in $spellings ; do - case "$s" in - american*) LC_CTYPE=en_US ;; - british*) LC_CTYPE=en_GB ;; - canadian*) LC_CTYPE=en_GB ;; - esac - LC_COLLATE=$LC_CTYPE - export LC_CYPTE LC_COLLATE - touch result/${s}.todo - set +x - for c in $classes ; do - for e in $sizeext ; do - f=final/english-${c}.${e} - if test -f $f ; then - cat $f - fi - for v in $variants ; do - f=final/variant_${v}-${c}.${e} - if test -f $f ; then - cat $f - fi - done - f=final/${s}-${c}.${e} - if test -f $f ; then - cat $f - fi - done - done > >(sort -fiu -S1M > result/${s}; rm result/${s}.todo) - set -x -done -for s in $spellings ; do - while test -e result/${s}.todo ; do - sleep 1 - done -done +./mk-list -v2 american 80 > result/american +./mk-list -v2 british 80 > result/british +./mk-list -v2 canadian 80 > result/canadian %install -rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}/usr/share/dict -cp -p result/* ${RPM_BUILD_ROOT}/usr/share/dict/ -mkdir -p ${RPM_BUILD_ROOT}/var/lib/dict -ln -sf ../../../usr/share/dict/american ${RPM_BUILD_ROOT}/var/lib/dict/words -ln -sf ../../../var/lib/dict/words ${RPM_BUILD_ROOT}/usr/share/dict/words -mkdir -p ${RPM_BUILD_ROOT}/sbin/conf.d -mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates -install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/ -install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/sbin/conf.d/ +mkdir -p %{buildroot}%{_datadir}/dict +install -pm 0644 result/* %{buildroot}%{_datadir}/dict/ +mkdir -p %{buildroot}%{_localstatedir}/lib/dict +ln -sf ../../..%{_datadir}/dict/american %{buildroot}%{_localstatedir}/lib/dict/words +ln -sf ../../../var/lib/dict/words %{buildroot}%{_datadir}/dict/words +mkdir -p %{buildroot}/sbin/conf.d +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +install -pm 0644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/ +install -pm 0755 %{SOURCE2} %{buildroot}/sbin/conf.d/ %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf %{buildroot} %post %{fillup_only} @@ -194,23 +101,21 @@ test -L usr/share/dict/words && rm usr/share/dict/words || true %files -%defattr(644,root,root,755) -%doc README -/usr/share/dict/american +%defattr(-,root,root,-) +%doc Copyright README %attr(755,root,root) /sbin/conf.d/SuSEconfig.words -/var/adm/fillup-templates/sysconfig.words -%dir /var/lib/dict/ -%ghost /usr/share/dict/words -%verify(not link mtime) /var/lib/dict/words +%{_datadir}/dict/american +%ghost %{_datadir}/dict/words +%{_localstatedir}/adm/fillup-templates/sysconfig.words +%dir %{_localstatedir}/lib/dict/ +%verify(not link mtime) %{_localstatedir}/lib/dict/words %files -n words-british -%defattr(644,root,root,755) -%doc README -/usr/share/dict/british +%defattr(-,root,root,-) +%{_datadir}/dict/british %files -n words-canadian -%defattr(644,root,root,755) -%doc README -/usr/share/dict/canadian +%defattr(-,root,root,-) +%{_datadir}/dict/canadian %changelog ++++++ SuSEconfig.words ++++++ --- /var/tmp/diff_new_pack.mBWV4m/_old 2011-06-14 10:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.mBWV4m/_new 2011-06-14 10:44:11.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. All rights reserved. +# Copyright (c) 2011 SuSE Linux AG, Nuernberg, Germany. All rights reserved. # # Author: Egmont Koblinger <[email protected]> # -# This module maintains a symlink `english' pointing to either `american' +# This module maintains a symlink `words' pointing to either `american' # or `british' or `canadian'. # check if we are started as root @@ -52,13 +52,56 @@ LINK_TO="british" elif [ "$INSTALLED_AMERICAN" = "no" -a "$INSTALLED_BRITISH" = "no" -a "$INSTALLED_CANADIAN" = "yes" ]; then LINK_TO="canadian" -elif [ "$INSTALLED_AMERICAN" = "yes" -a "$INSTALLED_BRITISH" = "yes" ]; then +elif [ "$INSTALLED_AMERICAN" = "yes" -a "$INSTALLED_BRITISH" = "yes" -a "$INSTALLED_CANADIAN" = "no" ]; then for dict in $ENGLISH_WORDS; do if [ "$dict" = "system" ]; then case "$RC_LANG" in en_GB*) dict="british" ;; en*) dict="american" ;; *) continue ;; + esac + fi + if [ -f $ROOT/usr/share/dict/$dict ]; then + LINK_TO="$dict" + break + fi + done +elif [ "$INSTALLED_AMERICAN" = "yes" -a "$INSTALLED_BRITISH" = "no" -a "$INSTALLED_CANADIAN" = "yes" ]; then + for dict in $ENGLISH_WORDS; do + if [ "$dict" = "system" ]; then + case "$RC_LANG" in + en_CA*) dict="canadian" ;; + en*) dict="american" ;; + *) continue ;; + esac + fi + if [ -f $ROOT/usr/share/dict/$dict ]; then + LINK_TO="$dict" + break + fi + done +elif [ "$INSTALLED_AMERICAN" = "no" -a "$INSTALLED_BRITISH" = "yes" -a "$INSTALLED_CANADIAN" = "yes" ]; then + for dict in $ENGLISH_WORDS; do + if [ "$dict" = "system" ]; then + case "$RC_LANG" in + en_CA*) dict="canadian" ;; + en_GB*) dict="british" ;; + *) continue ;; + esac + fi + if [ -f $ROOT/usr/share/dict/$dict ]; then + LINK_TO="$dict" + break + fi + done +elif [ "$INSTALLED_AMERICAN" = "yes" -a "$INSTALLED_BRITISH" = "yes" -a "$INSTALLED_CANADIAN" = "yes" ]; then + for dict in $ENGLISH_WORDS; do + if [ "$dict" = "system" ]; then + case "$RC_LANG" in + en_CA*) dict="canadian" ;; + en_GB*) dict="british" ;; + en*) dict="american" ;; + *) continue ;; esac fi if [ -f $ROOT/usr/share/dict/$dict ]; then ++++++ scowl-6.tar.gz -> scowl-7.1.tar.gz ++++++ ++++ 650029 lines of diff (skipped) ++++++ sysconfig.words ++++++ --- /var/tmp/diff_new_pack.mBWV4m/_old 2011-06-14 10:44:12.000000000 +0200 +++ /var/tmp/diff_new_pack.mBWV4m/_new 2011-06-14 10:44:12.000000000 +0200 @@ -1,17 +1,17 @@ -## Path: Applications/Ispell -## Description: Define ispell dictionary for english +## Path: Applications/Words +## Description: Define words dictionary for english ## Type: string ## Default: "system american british canadian" -## Config: ispell +## Config: words # -# SuSEconfig.ispell maintains a symbolic link from the `english' (default) -# dictionary to either `american' or `british' or `canadian'. In case only -# one of `words' or `words-british' or `words-canadian' are installed, then -# the link will point to this one. If more are installed, then the whitespace -# separated value of ENGLISH_WORDS takes effect. The magic word `system' expands -# to the system's default language (as defined in /etc/sysconfig/language's -# RC_LANG) if it's one of `american' or `british' languages, and expands to the -# empty string otherwise. The symlink will point to the first installed dictionary -# in the list. +# SuSEconfig.words maintains a symbolic link from the `english' (default) +# dictionary to either `american' or `british' or `canadian'. In case only one +# of `words' or `words-british' or `words-canadian' are installed, then the +# link will point to this one. If more are installed, then the whitespace +# separated value of ENGLISH_WORDS takes effect. The magic word `system' +# expands to the system's default language (as defined in +# /etc/sysconfig/language's RC_LANG) if it's one of `american' or `british' or +# `canadian' languages, and expands to the empty string otherwise. The symlink +# will point to the first installed dictionary in the list. # ENGLISH_WORDS="system american british canadian" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
