From 4235bf6f1999eb12f73c7e950156aa624cc0662ddb85f704d5456fc4e2e0d245 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 10:21:09 +0000 Subject: [PATCH] Accepting request 22594 from Base:System Copy from Base:System/dicts based on submit request 22594 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/22594 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dicts?expand=0&rev=7 --- dicts.changes | 5 + dicts.spec | 181 ++++------------ igerman98-20021114.tar.bz2 | 3 - igerman98-20091006.tar.bz2 | 3 + prepare-dicts.dif | 423 ++++++++++++++----------------------- 5 files changed, 211 insertions(+), 404 deletions(-) delete mode 100644 igerman98-20021114.tar.bz2 create mode 100644 igerman98-20091006.tar.bz2 diff --git a/dicts.changes b/dicts.changes index 12b8532..9306d8e 100644 --- a/dicts.changes +++ b/dicts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 19 17:12:04 CEST 2009 - werner@suse.de + +- Update igerman98 (bnc#547549) + ------------------------------------------------------------------- Fri Feb 13 01:08:42 CET 2009 - ro@suse.de diff --git a/dicts.spec b/dicts.spec index 5fd75dc..028c8c0 100644 --- a/dicts.spec +++ b/dicts.spec @@ -20,11 +20,11 @@ Name: dicts BuildRequires: ispell -License: BSD 3-Clause; GPL v2 or later; Public Domain, Freeware +License: BSD 3-clause (or similar) ; GPL v2 or later ; Public Domain, Freeware Group: Productivity/Text/Spell AutoReqProv: on Version: 1.5 -Release: 388 +Release: 389 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Ispell Dictionary Files # @@ -50,7 +50,7 @@ Source13: ellhnika.tar.bz2 Source14: rus-ispell.tar.bz2 Source15: eo-spell.tar.bz2 Source16: slovensko.tar.bz2 -Source17: igerman98-20021114.tar.bz2 +Source17: igerman98-20091006.tar.bz2 Source18: br.ispell-2.4.tar.bz2 Source19: finnish.tar.bz2 Source20: estonian.tar.bz2 @@ -62,11 +62,12 @@ This package contains sources for 14 ispell dictionaries: for German (already compiled for ispell in package ispell-german) -for New German (already compiled for ispell in package -ispell-ngerman) +for New German (already compiled for ispell in package ispell-ngerman) for New Swiss (already compiled for ispell in package ispell-nswiss) +for New Austrian (already compiled for ispell in package ispell-naustrian) + for Danish (already compiled for ispell in package ispell-danish) for Spanish (already compiled for ispell in package @@ -137,7 +138,7 @@ Authors: Jaak Pruulmann %package -n ispell-german -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: German ispell dictionary Group: Productivity/Text/Spell Provides: ispell_dictionary igerman locale(ispell:de;de_DE) @@ -174,12 +175,34 @@ package dicts. +Authors: +-------- + Björn Jacke + +%package -n ispell-naustrian +License: GPL v2 or later +Summary: New Austrian ispell dictionary +Group: Productivity/Text/Spell +Provides: ispell_dictionary inaustrian locale(ispell:de_AT) +Obsoletes: inswiss +AutoReqProv: on + +%description -n ispell-naustrian +This packages includes a ready austrian dictionary for ispell according +the new spelling rules. The name of the dictonary is swiss to be able +to distinguish it from those of the german packages. A short usage +description is given in /usr/share/doc/packages/ispell/README of the +packages ispell. The sources for this dictionary are included in the +package dicts. + + + Authors: -------- Björn Jacke %package -n ispell-ngerman -License: BSD 3-Clause; GPL v2 or later +License: BSD 3-clause (or similar) ; GPL v2 or later Summary: New German ispell dictionary Group: Productivity/Text/Spell Provides: ispell_dictionary ingerman locale(ispell:de;de_DE) @@ -381,7 +404,7 @@ Authors: Ignasi Labastida i Juan %package -n ispell-czech -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: Czech ispell dictionary Group: Productivity/Text/Spell Provides: ispell_dictionary iczech locale(ispell:cs;sk) @@ -404,7 +427,7 @@ Authors: Petr Kolar %package -n ispell-polish -License: BSD 3-Clause; GPL v2 or later +License: BSD 3-clause (or similar) ; GPL v2 or later Summary: Polish ispell dictionary Group: Productivity/Text/Spell Provides: ispell_dictionary ipolish locale(ispell:pl) @@ -425,7 +448,7 @@ Authors: Wlodzimierz Macewicz %package -n ispell-greek -License: BSD 3-Clause; GPL v2 or later +License: BSD 3-clause (or similar) ; GPL v2 or later Summary: Greek ispell dictionary Group: Productivity/Text/Spell Provides: ispell_dictionary igreek locale(ispell:el) @@ -441,7 +464,7 @@ the package dicts. %package -n ispell-russian -License: Any permissive +License: PERMISSIVE-OSI-COMPLIANT Summary: Russian ispell dictionary Group: Productivity/Text/Spell Provides: ispell_dictionary irussian locale(ispell:ru) @@ -481,7 +504,7 @@ Authors: Sergio Pokrovskij %package -n ispell-slovene -License: BSD 3-Clause; GPL v2 or later +License: BSD 3-clause (or similar) ; GPL v2 or later Summary: Slovenian ispell dictionary Group: Productivity/Text/Spell Provides: ispell_dictionary islovene locale(ispell:sl) @@ -563,7 +586,8 @@ Authors: $RPM_SOURCE_DIR/*.tar.bz2 \ $RPM_SOURCE_DIR/*.tgz do - test -e "$a" || continue + test -e "$a" || continue + test -e "${a##*/}" && continue ln -sf "$a" . done %setup -n prepare-dicts @@ -607,6 +631,13 @@ Authors: /usr/lib/ispell/swiss.hash %doc /usr/share/doc/packages/ispell-nswiss/ +%files -n ispell-naustrian +%defattr(-, root, root) +/usr/lib/ispell/emacs/austrian.el +/usr/lib/ispell/austrian.aff +/usr/lib/ispell/austrian.hash +%doc /usr/share/doc/packages/ispell-naustrian/ + %files -n ispell-danish %defattr(-, root, root) /usr/lib/ispell/emacs/dansk.el @@ -755,127 +786,3 @@ Authors: %doc /usr/share/doc/packages/dicts/ %changelog -* Fri Feb 13 2009 ro@suse.de -- add rpmlintrc README.orig is explicitly wanted with that name -* Fri Jun 27 2008 werner@suse.de -- No Brazilian dict for Portuguese (bnc#404193) -* Wed Nov 28 2007 werner@suse.de -- Make (x)emacs known about utf-8 encoding (Thanks Mario Natiello - for reported this). -* Thu Nov 08 2007 werner@suse.de -- Emacs 22 does not accept ranges for 8bit characters (bug #339781) -* Mon May 15 2006 werner@suse.de -- Remove Slovak locale from Slovene ispell dict -* Fri Apr 21 2006 werner@suse.de -- Map nswiss to de_CH locale only (bug #168292) -* Wed Apr 12 2006 werner@suse.de -- Add to all languages an UTF-8 formatter if missed -* Wed Mar 29 2006 werner@suse.de -- Add locale provides (bug #161478) -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Fri Jul 01 2005 werner@suse.de -- Make it build-root and no norootforbuild -* Mon Dec 20 2004 werner@suse.de -- The hash table ondisk format of the language files depend on the - architecture (little/big endiannes, pointer size) (bug #49407) -- Add finnish dictionary -- Add estinian dictionary -* Fri Mar 05 2004 ltinkl@suse.cz -- updated the Czech ispell dict to the current version -* Tue Apr 08 2003 werner@suse.de -- Use `-k' option of sort -* Wed Mar 05 2003 ro@suse.de -- fixed typo in specfile -* Wed Mar 05 2003 werner@suse.de -- Add rudimentary UTF-8 support for old deutsch dict -* Tue Jan 14 2003 werner@suse.de -- Fix wrong order of mkdir and install call in igerman98 -* Mon Dec 16 2002 werner@suse.de -- Update to igerman98-20021114 -* Wed Aug 14 2002 werner@suse.de -- Add brazilian dicts (bug #17694) -* Wed Jul 31 2002 werner@suse.de -- Update ispell-czech to 20020628 -* Tue Jul 30 2002 werner@suse.de -- Rename package doc directories (bug #15804) -* Thu Apr 18 2002 ro@suse.de -- rename espanol tarball (wget does not like this name) -* Wed Feb 20 2002 werner@suse.de -- Avoid circular depndencies (bug #13609) -* Wed Feb 13 2002 werner@suse.de -- Move all gziped tar's to bzip2 -- Correct tar uncompress option for bzip2 -* Thu Jan 24 2002 cihlar@suse.cz -- Update of czech -* Tue Jan 22 2002 egmont@suselinux.hu -- Rename packages to ispell- -* Fri Sep 14 2001 werner@suse.de -- Update rus-ispell due to the much better Licence -- Update of norsk and czech -* Thu Apr 19 2001 werner@suse.de -- Use LC_TYPE during sort for igerman and iswiss -- At sort: use only characters between beginning and flag mark -* Sat Apr 14 2001 bjacke@suse.de -- updated new german dictionary -- drop med-size of ingerman because it's useless -* Fri Mar 23 2001 werner@suse.de -- Add some aliases for catala and espanol mainly for lyx -* Mon Dec 18 2000 werner@suse.de -- Update of ispell-czech -* Wed Oct 04 2000 werner@suse.de -- Added conflict with frgutenb -- Move to NOARCH -* Mon Jun 05 2000 uli@suse.de -- moved docs to /usr/share/doc -* Fri Feb 25 2000 werner@suse.de -- Add german accordingly to the new german spelling rules - - Add swiss german -* Sun Oct 17 1999 werner@suse.de -- Add slovene -* Mon Sep 27 1999 bs@suse.de -- fixed requirements for sub packages -* Mon Sep 20 1999 ro@suse.de -- added provides ispell_dictionary for subpackages -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu Apr 15 1999 werner@suse.de -- Add esperanto - - Russian: multiple other character are allowd during - ispell session in emacs -* Wed Apr 14 1999 werner@suse.de -- Add greek and russian -* Tue Apr 13 1999 werner@suse.de -- Add czech and polish -* Mon Mar 08 1999 werner@suse.de -- Last clean up -* Fri Mar 05 1999 werner@suse.de -- Update danish and swedish - - Change source of norsk - - Add portugues, catalan -* Thu Mar 04 1999 werner@suse.de -- Preparing for a better (x)emacs interface: Use the new - emacs lisp interface of the package ispell to create the - spell menus modular on the fly in both emacs and xemacs - Edit pulldown. -* Fri Nov 13 1998 bs@suse.de -- fixed double %%description -* Thu Nov 12 1998 bs@suse.de -- fixed spec file for new rpm -* Mon Mar 09 1998 werner@suse.de -- renamed ifrensh to ifrench -* Tue Feb 10 1998 werner@suse.de -- Update of frensh - - Add some languages: - * German (hk2-deutsch) - * Danish (idanish-1.2) - * Spanish (espa~nol-1.5) - * French (francais-IREQ-1.4) - * Italian (pre-alpha version) - * Dutch (dutch96/dutch96.aff 1.1) - * Swedish (iswedish-1.2) - * Norwegian (norsk) -* Wed Feb 04 1998 ro@suse.de -- generated spec file -* Thu Feb 06 1997 werner@suse.de -- hk2-deutsch integrated diff --git a/igerman98-20021114.tar.bz2 b/igerman98-20021114.tar.bz2 deleted file mode 100644 index b7333bd..0000000 --- a/igerman98-20021114.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b73d931bf59303cd71ce4e626589665c328d9c2666ee0562b78fe247045e27c -size 304288 diff --git a/igerman98-20091006.tar.bz2 b/igerman98-20091006.tar.bz2 new file mode 100644 index 0000000..85d7b5d --- /dev/null +++ b/igerman98-20091006.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47f6f9c09926fdb0505a1415a3798755ce52e531889417fe38789371c58b1a51 +size 466677 diff --git a/prepare-dicts.dif b/prepare-dicts.dif index c2a67f6..329b19f 100644 --- a/prepare-dicts.dif +++ b/prepare-dicts.dif @@ -15,7 +15,7 @@ + +DICTDIR = /usr/src/dicts +DEUTSCH = hk2-deutsch -+GERMAN = igerman98-20021114 ++GERMAN = igerman98-20091006 +FRANCAIS = francais-IREQ-1.4 +DANSK = idanish-1.2.1 +ESPANOL = espa~nol-1.5 @@ -83,7 +83,7 @@ + +$(GERMAN)/.touch: ../$(GERMAN).tar.bz2 + tar xjf $< -C ./ -+ cd $(GERMAN)/ && mv german.aff german.aff-bj ++ cd $(GERMAN)/ && mv ispell/de_DE.aff.in ispell/de_DE.aff.in-bj + cd $(GERMAN)/ && touch Makefile + @touch $@ + @@ -266,7 +266,7 @@ + espa~nol-1.5 + francais-IREQ-1.4 + hk2-deutsch -+ igerman98-20021114 ++ igerman98-20091006 + ispell-czech-20020628 + idanish-1.2.1 + ispell-norsk-2.0 @@ -296,7 +296,7 @@ + espa~nol-1.5 + francais-IREQ-1.4 + hk2-deutsch -+ igerman98-20021114 ++ igerman98-20091006 + ispell-czech-20020628 + idanish-1.2.1 + ispell-norsk-2.0 @@ -1478,307 +1478,179 @@ suffixes ---- igerman98-20021114/LC_CTYPE -+++ igerman98-20021114/LC_CTYPE 2006-04-12 17:34:50.000000000 +0200 +--- igerman98-20091006/LC_CTYPE ++++ igerman98-20091006/LC_CTYPE 2006-04-12 17:34:50.000000000 +0200 @@ -0,0 +1 @@ +de_DE.ISO-8859-1 ---- igerman98-20021114/Makefile -+++ igerman98-20021114/Makefile 2006-04-12 17:34:50.000000000 +0200 -@@ -1,3 +1,17 @@ +--- igerman98-20091006/Makefile ++++ igerman98-20091006/Makefile 2009-10-19 14:47:53.275429305 +0200 +@@ -4,6 +4,22 @@ + # + # Copyright: GNU GPLv2 and GPLv3 + +## +## SuSE stuff +## + -+MAKE_SORTTMP = -T /var/tmp ++MAKE_SORTTMP = -T /var/tmp +SORT = sort -u -t/ -k 1f,1 -k 1 $(MAKE_SORTTMP) +FIX8BIT = ../fix8bit +PACKNAME = ispell-ngerman +SPACKNAME = ispell-nswiss ++APACKNAME = ispell-naustrian +DOCDIR = /usr/share/doc/packages/$(PACKNAME) +SDOCDIR = /usr/share/doc/packages/$(SPACKNAME) ++ADOCDIR = /usr/share/doc/packages/$(APACKNAME) +MANDIR = /usr/share/man/man1 -+LIBDIR = $(shell ispell -vv|grep LIBDIR|sed "s/.*\=//;s/^ //g" |tr -d \") -+ - WORTE = \ - adjektive-a.txt \ - anglizismen-a.txt \ -@@ -39,13 +53,14 @@ WORTE = \ - vornamen2.txt \ - namen2.txt \ - medizin.txt \ -- geografie2.txt --# not used: austriazismen.txt -+ geografie2.txt \ -+ austriazismen.txt -+# not used: - # helvetismen.txt (automatically used by "make swiss.hash") - # fixwords.txt (used below) - # abkuerzpunkt.txt (special treatment below) ++LIBDIR = $(shell ispell -vv|grep LIBDIR|sed "s/.*\=//;s/^ //g" |tr -d \") ++ + LANGS=de_DE de_AT de_CH + LANGS2=$(LANGS) de_all + DATE=`date +%Y%m%d` +@@ -11,16 +25,8 @@ VERSION=`cat VERSION` + VERSION_EXTRA=$(shell find . -name "VERSION.*" -print | while read i ; do echo -n "+"; head -1 "$$i" | tr -d "\n" ; done) + VERSION_STRING=$(VERSION)$(VERSION_EXTRA) (build $(DATE)) --ISPELLIBDIR = $$(ispell -vv |grep "LIBDIR" |sed "s/.*\=//" |tr -d \") -+ISPELLIBDIR = $$(ispell -vv |grep "LIBDIR" |sed "s/.*\=//;s/^ //g" |tr -d \") +-all: +- @echo "A default make target doesn't exist. You might want to use one of those:" +- @echo " make hunspell/de_DE.dic hunspell/de_DE.aff (or de_AT or de_CH)" +- @echo " make myspell/de_DE.dic myspell/de_DE.aff (or de_AT or de_CH)" +- @echo " make ispell/de_DE.aff ispell/de_DE.hash (or de_AT, de_CH ...)" +- @echo " make aspell/de_DE.rws (or de_AT, de_CH ...)" +- @echo " make ligature/rmligs" +- @echo " make isowordlist-de_DE (or de_AT, de_CH ...)" +- @echo "Did I forget an important one ?-)" +- ++all: ispell/de_DE.aff ispell/de_DE.hash ispell/de_AT.aff ispell/de_AT.hash ispell/de_CH.aff ispell/de_CH.hash ligature/rmligs ++install: german-install swiss-install austrian-install rmligs-install + + + #MYLANG = $(shell echo -n $@ | sed "s/^.*_\(de_.*$$\)/\1/") +@@ -49,13 +54,52 @@ WORDS_BLACKLISTS_$(1) = $$(shell $$(FIND + endef + $(foreach langcode,$(LANGS2),$(eval $(call WORDS_define_template,$(langcode)))) + +-ISPELLIBDIR = $$($(ISPELL) -vv |grep "LIBDIR" |$(SED) "s/.*\=//" |tr -d \") ++ISPELLIBDIR = $$($(ISPELL) -vv |grep "LIBDIR" |$(SED) "s/.*\=//;s/^ //g" |tr -d \") DESTDIR = - MAKE = make - BUILDHASH = buildhash -@@ -62,31 +77,40 @@ vpath %.txt ./dicts - - # to let `sort' behave right: setting LC_ALL ist not enough, because - # UTF-8 locales won't get overwritten by that, we also need to reset LANG! --LANG = C --LC_ALL = C --LC_COLLATE = C -- -- -- -+#LANG = C -+#LC_ALL = C -+#LC_COLLATE = C - - - ### - ## Ispell stuff: - ### - -+all: german.hash swiss.hash rmligs -+install: german-install swiss-install rmligs-install + - german.hash: german.aff all.words .copyright - $(BUILDHASH) all.words ./german.aff $@ - - all.words.raw: unpack $(addprefix dicts/,$(WORTE)) -- cd dicts; sed "s/qq//g;s/\.//" abkuerzpunkt.txt $(WORTE) |sort -u |../bin/uniqflag.pl > ../$@.tmp -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cd dicts; sed "s/qq//g;s/\.//" abkuerzpunkt.txt $(WORTE) | $(SORT) |../bin/uniqflag.pl > ../$@.tmp - mv $@.tmp $@ - -+german.aff: german.aff-bj $(FIX8BIT) -+ $(FIX8BIT) -8 < german.aff-bj > german.aff -+ - all.words: all.words.raw german.aff - munchlist -l ./german.aff all.words.raw > $@ - --install: german.hash -+german-install: german.hash - mkdir -p $(DESTDIR)$(ISPELLIBDIR) - cp german.aff german.hash $(DESTDIR)$(ISPELLIBDIR) ++german-install: ispell/de_DE.aff ispell/de_DE.hash ++ mkdir -p $(DESTDIR)$(ISPELLIBDIR) ++ cp ispell/de_DE.aff $(DESTDIR)$(ISPELLIBDIR)/german.aff ++ cp ispell/de_DE.hash $(DESTDIR)$(ISPELLIBDIR)/german.hash + mkdir -p $(DESTDIR)$(DOCDIR) + cp Documentation/README $(DESTDIR)$(DOCDIR)/ + cp Documentation/Copyright $(DESTDIR)$(DOCDIR)/ + cp Documentation/GPL2 $(DESTDIR)$(DOCDIR)/ + cp Documentation/Changes $(DESTDIR)$(DOCDIR)/ - - ## Swiss Ispell stuff: - -@@ -94,7 +118,8 @@ swiss.aff: - sed "/swiss-del/d" german.aff |sed "/swiss-convert/s/sS/SS/g" |sed '/\#swiss-only/s/^\#//' |sed '/stringchar/!s/sS//g' > swiss.aff - - all.words.swiss.raw: unpack $(addprefix dicts/,$(WORTE)) -- cd dicts; sed "s/qq//g;s/sS/ss/g;s/\.//g" $(WORTE) helvetismen.txt abkuerzpunkt.txt |sort -u > ../$@ -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cd dicts; sed "s/qq//g;s/sS/ss/g;s/\.//g" $(WORTE) helvetismen.txt abkuerzpunkt.txt | $(SORT) > ../$@ - - all.words.swiss: all.words.swiss.raw swiss.aff - munchlist -l ./swiss.aff all.words.swiss.raw > $@ -@@ -105,7 +130,11 @@ swiss.hash: swiss.aff all.words.swiss .c - swiss-install: swiss.hash - mkdir -p $(DESTDIR)$(ISPELLIBDIR) - cp swiss.aff swiss.hash $(DESTDIR)$(ISPELLIBDIR) -- ++ ++swiss-install: ispell/de_CH.aff ispell/de_CH.hash ++ mkdir -p $(DESTDIR)$(ISPELLIBDIR) + mkdir -p $(DESTDIR)$(SDOCDIR) ++ cp ispell/de_CH.aff $(DESTDIR)$(ISPELLIBDIR)/swiss.aff ++ cp ispell/de_CH.hash $(DESTDIR)$(ISPELLIBDIR)/swiss.hash + cp Documentation/README.swiss $(DESTDIR)$(SDOCDIR)/README + cp Documentation/Copyright $(DESTDIR)$(SDOCDIR)/ + cp Documentation/GPL2 $(DESTDIR)$(SDOCDIR)/ + cp Documentation/Changes $(DESTDIR)$(SDOCDIR)/ - - ### - ## Aspell stuff: -@@ -115,14 +144,18 @@ help.hash: german.aff all.words2 .copyri - $(BUILDHASH) all.words2 ./german.aff $@ - - all.words2: unpack -- cd dicts; sed s/qq//g $(WORTE) |sort -u > ../$@ -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cd dicts; sed s/qq//g $(WORTE) | $(SORT) > ../$@ - - aspell: help.hash -- #cat all.words2 dicts/abkuerzpunkt.txt |$(ISPELL) -e -d./help |sed -f ./bin/dic2iso |sort -u |$(ASPELL) --lang=german create master ./german -- sed "s/\.//g" all.words2 dicts/abkuerzpunkt.txt |$(ISPELL) -e -d./help |sed -f ./bin/dic2iso |sort -u |$(ASPELL) --lang=german create master ./german -+ #LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ #cat all.words2 dicts/abkuerzpunkt.txt |$(ISPELL) -e -d./help |sed -f ./bin/dic2iso |$(SORT)|$(ASPELL) --lang=german create master ./german -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ sed "s/\.//g" all.words2 dicts/abkuerzpunkt.txt |$(ISPELL) -e -d./help |sed -f ./bin/dic2iso |$(SORT)|$(ASPELL) --lang=german create master ./german - - swiss-aspell: swiss -- cat all.words.swiss |$(ISPELL) -e -d./swiss |sed -f ./bin/dic2iso |sort -u |$(ASPELL) --lang=swiss create master ./swiss -+ LC_CTYPE=de_CH.ISO-8859-1 ; export LC_CTYPE ; \ -+ cat all.words.swiss |$(ISPELL) -e -d./swiss |sed -f ./bin/dic2iso |$(SORT)|$(ASPELL) --lang=swiss create master ./swiss - - - -@@ -132,16 +165,20 @@ swiss-aspell: swiss - ### - - myspelldic: all.words --# cd dicts; sed "s/qq//g" abkuerzpunkt.txt $(WORTE) |sort -u |../bin/myspellfixprefix.pl |sort -u |../bin/uniqflag.pl > ../all.words.myspell -- cat all.words dicts/abkuerzpunkt.txt |sort -u |./bin/myspellfixprefix.pl |sort -u > all.words.myspell -+# LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+# cd dicts; sed "s/qq//g" abkuerzpunkt.txt $(WORTE) | $(SORT) |../bin/myspellfixprefix.pl | $(SORT) |../bin/uniqflag.pl > ../all.words.myspell -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cat all.words dicts/abkuerzpunkt.txt | $(SORT) |./bin/myspellfixprefix.pl |$(SORT) > all.words.myspell - wc -l all.words.myspell |sed "s/ *\([0-9]*\) .*/\1/g" >myspell/de_DE.dic - ./bin/dic2iso >myspell/de_DE.dic -- sed "s/qq//g" dicts/austriazismen.txt |sort -u |./bin/myspellfixprefix.pl |sort -u |./bin/uniqflag.pl > all.words.myspell.aust -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ sed "s/qq//g" dicts/austriazismen.txt |$(SORT) |./bin/myspellfixprefix.pl |$(SORT) |./bin/uniqflag.pl > all.words.myspell.aust - wc -l all.words.myspell.aust |sed "s/ *\([0-9]*\) .*/\1/g" >myspell/de_AT.dic - ./bin/dic2iso >myspell/de_AT.dic - - swiss-myspelldic: all.words.swiss -- cat all.words.swiss dicts/abkuerzpunkt.txt dicts/helvetismen.txt |sort -u |./bin/myspellfixprefix.pl |sort -u |./bin/uniqflag.pl > all.words.myspell.swiss -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cat all.words.swiss dicts/abkuerzpunkt.txt dicts/helvetismen.txt |$(SORT) |./bin/myspellfixprefix.pl |$(SORT) |./bin/uniqflag.pl > all.words.myspell.swiss - wc -l all.words.myspell.swiss |sed "s/ *\([0-9]*\) .*/\1/g" >myspell/de_CH.dic - ./bin/dic2iso >myspell/de_CH.dic - -@@ -157,7 +194,8 @@ liglist.aff: - sed '/\#qqq/s/^\#//g;/\#nnn/d' german.aff > liglist.aff - - all.words.liglist.raw: unpack $(addprefix dicts/,$(WORTE)) -- cd dicts ; sed "s/\.//" *.txt |sort -u > ../$@ -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cd dicts ; sed "s/\.//" *.txt |$(SORT) > ../$@ - - all.words.liglist: all.words.liglist.raw liglist.aff - munchlist -l ./liglist.aff all.words.liglist.raw > $@ -@@ -166,27 +204,31 @@ liglist.hash: liglist.aff all.words.ligl - $(BUILDHASH) all.words.liglist ./liglist.aff $@ - - liglist: liglist.hash .copyright -+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ - cat ligature/oldspell.liglist all.words.liglist \ - | $(ISPELL) -e -d./liglist \ - | tr \ '\n' \ - | grep qq \ -- | sort -u \ -+ | $(SORT) \ - | sed 's/fqqf/f\|f/g;s/fqql/f\|l/g;s/fqqi/f\|i/g' \ - | grep \| \ - | sed s/qq//g \ - | sed -f ./bin/dic2iso \ - | tr A-Z a-z \ -- | sort -u \ -+ | $(SORT) \ - > liglist - - rmligs: liglist - cat ligature/rmligs.skel liglist > rmligs - chmod 755 rmligs - -- -- -- -- -+rmligs-install: rmligs ++ ++austrian-install: ispell/de_AT.aff ispell/de_AT.hash ++ mkdir -p $(DESTDIR)$(ISPELLIBDIR) ++ cp ispell/de_AT.aff $(DESTDIR)$(ISPELLIBDIR)/austrian.aff ++ cp ispell/de_AT.hash $(DESTDIR)$(ISPELLIBDIR)/austrian.hash ++ mkdir -p $(DESTDIR)$(ADOCDIR) ++ cp Documentation/README $(DESTDIR)$(ADOCDIR)/ ++ cp Documentation/Copyright $(DESTDIR)$(ADOCDIR)/ ++ cp Documentation/GPL2 $(DESTDIR)$(ADOCDIR)/ ++ cp Documentation/Changes $(DESTDIR)$(ADOCDIR)/ ++ ++rmligs-install: ligature/rmligs + mkdir -p $(DESTDIR)/usr/bin -+ install -m 0755 rmligs $(DESTDIR)/usr/bin/ ++ install -m 0755 ligature/rmligs $(DESTDIR)/usr/bin/ + mkdir -p $(DESTDIR)$(DOCDIR) + cp Documentation/README.ligatures $(DESTDIR)$(DOCDIR)/ + mkdir -p $(DESTDIR)$(MANDIR) + cp ligature/rmligs.1 $(DESTDIR)$(MANDIR)/ - ++ + # make might have to be GNU make, + # please report problems with other make versions to me. + MAKE = make + FIND = find +-SORT = sort ++#SORT = sort + TAR = tar + SED = sed + NL = nl +@@ -129,6 +165,9 @@ LC_COLLATE=C + ## Ispell stuff: ### - ## misc stuff: -@@ -194,22 +236,24 @@ rmligs: liglist ++ispell/de_DE.aff.in: ispell/de_DE.aff.in-bj $(FIX8BIT) ++ $(FIX8BIT) -8 < ispell/de_DE.aff.in-bj > ispell/de_DE.aff.in ++ + ispell/de_AT.aff ispell/de_DE.aff: ispell/de_DE.aff.in + $(CP) ispell/de_DE.aff.in $@ - .copyright: -- @echo  - @cat Documentation/Copyright - @sleep 0 +@@ -142,9 +181,10 @@ ispell/$(1).hash: ispell/$(1).aff all.wo + $(BUILDHASH) all.words.munch.$(1).tmp ./ispell/$(1).aff $$@ - isowordlist: german.hash -- cat all.words |$(ISPELL) -e -d./german |tr \ '\n' |sed -f ./bin/dic2iso |sort -u > isowordlist + all.words.$(1).tmp: $$(WORDS_$(1)) $$(WORDS_de_all) dicts/abkuerzpunkt.txt + LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cat all.words |$(ISPELL) -e -d./german |tr \ '\n' |sed -f ./bin/dic2iso |$(SORT) > isowordlist + $(SED) "s/qq//g;s/\.//;s/\-.*//" dicts/abkuerzpunkt.txt $$(WORDS_$(1)) $$(WORDS_de_all) \ + | (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) \ +- | grep -v "\/.*d" | grep -v "##" | $(SED) "s/#.*//" | ./bin/myspellfixprefix.pl | $(SORT) -u > $$@ ++ | grep -v "\/.*d" | grep -v "##" | $(SED) "s/#.*//" | ./bin/myspellfixprefix.pl | $(SORT) > $$@ - swiss-isowordlist: swiss -- cat all.words.swiss |$(ISPELL) -e -d./swiss |tr \ '\n' |sed -f ./bin/dic2iso |sort -u > swiss-isowordlist + all.words.munch.$(1).tmp: all.words.$(1).tmp ispell/$(1).aff + @# the munched way to overcome "Hash table overflowed by xxxx words" error: +@@ -157,7 +197,8 @@ ispell/$(1)_null.hash: ispell/$(1)_null. + $(BUILDHASH) all.words.placebo.tmp ispell/$(1)_null.aff $$@ + + isowordlist-$(1): $(AFFIX_EXPAND_PREREQ) all.words.$(MUNCH_PFX)$(1).tmp +- $(AFFIX_EXPAND_COMMAND) < all.words.$(MUNCH_PFX)$(1).tmp |tr ' ' '\n' |$(SED) -f ./bin/dic2iso | $(SORT) -u > $$@ + LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ cat all.words.swiss |$(ISPELL) -e -d./swiss |tr \ '\n' |sed -f ./bin/dic2iso |$(SORT) > swiss-isowordlist ++ $(AFFIX_EXPAND_COMMAND) < all.words.$(MUNCH_PFX)$(1).tmp |tr ' ' '\n' |$(SED) -f ./bin/dic2iso | $(SORT) > $$@ - clean: - rm -f all.words* *.hash swiss.aff igerman98*.tar.bz2 *isowordlist german swiss unpack sort liglist.aff liglist.hash liglist rmligs MD5sums myspell/*.dic *.tmp + endef + $(foreach langcode,$(LANGS),$(eval $(call LANG_ispell_dict_template,$(langcode)))) +@@ -395,23 +436,25 @@ ispell/liglist_null.hash: ispell/liglist + $(BUILDHASH) all.words.placebo.tmp ispell/$(1)_null.aff $$@ + all.words.liglist.tmp: $(foreach langcode,$(LANGS2),$(WORDS_$(langcode))) ++ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ + $(SED) "s/\.//" $(foreach langcode,$(LANGS2),$(WORDS_$(langcode))) | \ + grep -v "\/.*d" | grep -v "##" | $(SED) "s/#.*//" | \ +- $(SORT) -u > $$@ ++ $(SORT) > $$@ + + + liglist.tmp: $(AFFIX_EXPAND_PREREQ) all.words.liglist.tmp ++ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ + cat ligature/oldspell.liglist all.words.liglist.tmp \ + | $(AFFIX_EXPAND_COMMAND) \ + | tr \ '\n' \ + | grep qq \ +- | $(SORT) -u \ ++ | $(SORT) \ + | $(SED) 's/fqqf/f\|f/g;s/fqql/f\|l/g;s/fqqi/f\|i/g' \ + | grep \| \ + | $(SED) s/qq//g \ + | $(SED) -f ./bin/dic2iso \ + | tr A-Z a-z \ +- | $(SORT) -u \ ++ | $(SORT) \ + > $$@ + + ligature/rmligs: liglist.tmp ligature/rmligs.skel +@@ -442,7 +485,7 @@ clean: sort: -- @if grep [äöüÄÖÜß] dicts/*.txt ;then echo "!!! wrong characters in dictionay files !!!";exit 1;fi -- cd dicts; find . -name "*.txt" |while read i; do sort -u -o $$i $$i; done -+ @LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \ -+ if grep [äöüÄÖÜß] dicts/*.txt ;then echo "!!! wrong characters in dictionay files !!!";exit 1;fi -+ cd dicts; find . -name "*.txt" |while read i; do $(SORT) -o $$i $$i; done + @if grep [äöüÄÖÜß] dicts/*.txt ;then echo "!!! illegal ISO-8859-1 characters in dictionary files !!!";exit 1;fi + @if LC_ALL=de_DE.UTF-8 grep [`echo -n "äöüÄÖÜß"|iconv -f iso8859-1 -t utf-8`] dicts/*.txt ;then echo "!!! illegal UTF-8 characters in dictionary files !!!";exit 1;fi +- $(FIND) ./dicts/ -name "*.txt" -print -o -name "blacklist*" -print | while read i; do $(SORT) -u -o "$$i" "$$i"; done ++ $(FIND) ./dicts/ -name "*.txt" -print -o -name "blacklist*" -print | while read i; do $(SORT) -o "$$i" "$$i"; done pack: sort - rm -f unpack ---- igerman98-20021114/german.aff-bj -+++ igerman98-20021114/german.aff-bj 2006-04-12 17:34:50.000000000 +0200 -@@ -269,35 +269,35 @@ altstringchar SS SS - # - # N/Troff with -ms/-me macros packages - # --#altstringtype "nroff" "nroff" ".nr" ".ms" ".me" -+altstringtype "nroff" "nroff" ".nr" ".ms" ".me" - --#altstringchar a\\*\: a\" --#altstringchar A\\*\: A\" --#altstringchar o\\*\: o\" --#altstringchar O\\*\: O\" --#altstringchar u\\*\: u\" --#altstringchar U\\*\: U\" --#altstringchar \\*8 sS --#altstringchar SS Ss --#altstringchar ss ss --#altstringchar SS SS -+altstringchar a\\*\: a\" -+altstringchar A\\*\: A\" -+altstringchar o\\*\: o\" -+altstringchar O\\*\: O\" -+altstringchar u\\*\: u\" -+altstringchar U\\*\: U\" -+altstringchar \\*8 sS -+altstringchar SS Ss -+altstringchar ss ss -+altstringchar SS SS - - # - # N/Troff with -mm macros - # --#altstringtype "-mm" "nroff" ".nr" ".mm" -+altstringtype "-mm" "nroff" ".nr" ".mm" -+ -+altstringchar a\\*\: a\" -+altstringchar A\\*\; A\" -+altstringchar o\\*\: o\" -+altstringchar O\\*\; O\" -+altstringchar u\\*\: u\" -+altstringchar U\\*\; U\" -+altstringchar \\*(ss sS -+altstringchar SS Ss -+altstringchar ss ss -+altstringchar SS SS - --#altstringchar a\\*\: a\" --#altstringchar A\\*\; A\" --#altstringchar o\\*\: o\" --#altstringchar O\\*\; O\" --#altstringchar u\\*\: u\" --#altstringchar U\\*\; U\" --#altstringchar \\*(ss sS --#altstringchar SS Ss --#altstringchar ss ss --#altstringchar SS SS -- - # - # Alternate form for NeXTSTEP charset - # + exit 1 --- ispell-czech/LC_CTYPE +++ ispell-czech/LC_CTYPE 2006-04-12 17:34:50.000000000 +0200 @@ -0,0 +1 @@ @@ -2363,7 +2235,7 @@ MAKE = make -CONFIG = ../../config.sh -+CONFIG = .config ++CONFIG = ./.config PATHADDER = ../.. -BUILDHASH = ../../buildhash +BUILDHASH = buildhash @@ -2393,7 +2265,7 @@ + install: install-norsk install-nynorsk install-scripts + mkdir -p $(DESTDIR)$(DOCDIR) -+ @. ${CONFIG}; set -x; \ ++ @. $(CONFIG); set -x; \ + $$INSTALL -m 0444 $(DOCSOURCE) $(DESTDIR)$(DOCDIR)/ install-norsk install-nynorsk: install-%: %.hash $(CONFIG) @@ -3005,6 +2877,29 @@ # Plain LaTeX files # altstringtype "latex" "tex" ".tex" ".bib" +--- suse/emacs/austrian.el ++++ suse/emacs/austrian.el 2007-11-28 13:53:04.789147533 +0100 +@@ -0,0 +1,20 @@ ++;; Used by ispell-emacs-menu.el ++;; Do *not* byte-compile this file because its loaded by both emacs and xemacs ++ ++(append-ispell-dict-alist "austrian.hash" ++ '("austrian-babel" ++ "[a-zA-Z\"]" ++ "[^a-zA-Z\"]" "[']" t ("-C" "-d" "austrian") "~tex" nil)) ++ ++(append-ispell-dict-alist "austrian.hash" ++ '("austrian" ++ "[a-zA-Z\304\326\334\344\366\337\374]" ++ "[^a-zA-Z\304\326\334\344\366\337\374]" ++ "[']" t ("-C" "-d" "austrian") "~latin1" iso-latin-1)) ++ ++(append-ispell-dict-alist "austrian.hash" ++ '("austrian-utf8" ++ "[a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]" ++ "[^a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]" ++ "[']" t ("-C" "-d" "austrian") "~utf8" utf-8)) ++ --- suse/emacs/brazilian.el +++ suse/emacs/brazilian.el 2007-11-28 13:54:24.391250588 +0100 @@ -0,0 +1,21 @@