Hello community, here is the log from the commit of package igerman98 for openSUSE:Factory checked in at 2017-07-07 10:16:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/igerman98 (Old) and /work/SRC/openSUSE:Factory/.igerman98.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "igerman98" Fri Jul 7 10:16:52 2017 rev:28 rq:508330 version:20161207 Changes: -------- --- /work/SRC/openSUSE:Factory/igerman98/igerman98.changes 2017-03-12 20:03:04.509608950 +0100 +++ /work/SRC/openSUSE:Factory/.igerman98.new/igerman98.changes 2017-07-07 10:16:55.454945289 +0200 @@ -1,0 +2,9 @@ +Mon Jul 3 10:57:59 UTC 2017 - [email protected] + +- Update to 20161207: + * Bunch of new words +- Refresh patch igerman98-ispell-sort.patch +- Remove hunspell parts as that is provided by the myspell-dictionaries + package + +------------------------------------------------------------------- Old: ---- igerman98-20160407.tar.bz2 New: ---- igerman98-20161207.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ igerman98.spec ++++++ --- /var/tmp/diff_new_pack.OgjBp1/_old 2017-07-07 10:16:56.350818528 +0200 +++ /var/tmp/diff_new_pack.OgjBp1/_new 2017-07-07 10:16:56.354817962 +0200 @@ -16,19 +16,19 @@ # +%define aspell_dict_dir %(aspell dump config dict-dir) +%define ispell_dict_dir %(ispell -vv|grep LIBDIR|sed \"s/.*\=//;s/^ //g\" |tr -d \\") +%define ispell_emacs_lib_dir %{_prefix}/lib/ispell/emacs Name: igerman98 -Version: 20160407 +Version: 20161207 Release: 0 Summary: German Spell Check Dictionaries -License: GPL-2.0 and LGPL-2.1 -Group: Productivity/Text/Spell # According to Documentation/Copyright we can distribute program under GPL-2.0 # or GPL-3.0. We have choosed GPL-2.0. More over, aspell/de_all_phonet.dat.in # is LGPL-2.1, so adding it to license string. +License: GPL-2.0 AND LGPL-2.1 +Group: Productivity/Text/Spell Url: http://www.j3e.de/ispell/igerman98/dict/ -BuildRequires: aspell -BuildRequires: hunspell -BuildRequires: ispell Source0: https://www.j3e.de/ispell/igerman98/dict/%{name}-%{version}.tar.bz2 Source1: Nwordlist.tgz Source2: fix8bit.c @@ -36,36 +36,18 @@ Source4: german.el Source5: swiss.el Patch0: %{name}-ispell-sort.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define aspell_dict_dir %(aspell dump config dict-dir) -%define ispell_dict_dir %(ispell -vv|grep LIBDIR|sed \"s/.*\=//;s/^ //g\" |tr -d \\") -%define ispell_emacs_lib_dir /usr/lib/ispell/emacs -%define hunspell_dict_dir /usr/share/myspell/ +BuildRequires: aspell +BuildRequires: ispell %description A meta package for German, Swiss, and Austrian dictionaries for the ispell, aspell and myspell spell checkers. - -Authors: --------- -Björn JACKE -Daniel NABER -Werner LEMBERG -László NÉMETH -Jan SCHREIBER -Roland ROSENFELD -Till BERGER -Franz Michael BAUMANN -many other contributors ... - %package doc Summary: Documentation for German dictionaries License: GPL-2.0+ Group: Productivity/Text/Spell -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description doc Documentation for German, Swiss, and Austrian dictionaries for the ispell, @@ -75,8 +57,8 @@ Summary: A German Dictionary for ASpell License: GPL-2.0+ Group: Productivity/Text/Spell -Provides: locale(aspell:de) Requires: aspell >= 0.60 +Provides: locale(aspell:de) %description -n aspell-de A German dictionary for the ASpell spell checker. @@ -90,7 +72,7 @@ %description -n ispell-ngerman This package includes a ready German dictionary for ispell. A short -usage description is given in /usr/share/doc/packages/ispell/README of +usage description is given in %{_docdir}/ispell/README of the package ispell. %package -n ispell-nswiss @@ -104,7 +86,7 @@ This package includes a ready Swiss dictionary for ispell according the new spelling rules. The name of the dictionary is nswiss 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 +description is given in %{_docdir}/ispell/README of the package ispell. %package -n ispell-naustrian @@ -118,7 +100,7 @@ This package includes a ready Austrian dictionary for ispell according the new spelling rules. The name of the dictionary is naustrian 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 +description is given in %{_docdir}/ispell/README of the package ispell. %prep @@ -128,57 +110,53 @@ %build # prepare ispell dictionary -cp %{S:2} . +cp %{SOURCE2} . gcc -O2 -o fix8bit fix8bit.c mv ispell/de_DE.aff.in ispell/de_DE.aff.in-bj ./fix8bit -8 < ispell/de_DE.aff.in-bj > ispell/de_DE.aff.in for l in DE AT CH; do - make ispell/de_$l.{aff,hash} - make aspell/de_$l.rws - make hunspell/de_$l.{dic,aff} + make %{?_smp_mflags} ispell/de_$l.{aff,hash} + make %{?_smp_mflags} aspell/de_$l.rws done -make ligature/rmligs +make %{?_smp_mflags} ligature/rmligs # aspell -- creating extra dictionary with Novell jargon -/usr/bin/word-list-compress c < Nwordlist > Nwordlist.cwl -/usr/bin/word-list-compress d < Nwordlist.cwl | aspell --lang=de_DE --local-data-dir=./aspell/ create master ./deNovellwords +%{_bindir}/word-list-compress c < Nwordlist > Nwordlist.cwl +%{_bindir}/word-list-compress d < Nwordlist.cwl | aspell --lang=de_DE --local-data-dir=./aspell/ create master ./deNovellwords for i in aspell/*.multi; do echo "add deNovellwords" >> $i; done %install -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} +mkdir -p %{buildroot}%{_docdir}/%{name} # aspell -mkdir -p $RPM_BUILD_ROOT%{aspell_dict_dir} -install -m 644 aspell/*.{rws,dat,alias,multi} $RPM_BUILD_ROOT%{aspell_dict_dir} -install -m 644 ./deNovellwords $RPM_BUILD_ROOT%{aspell_dict_dir} -echo "add de_DE.multi" > $RPM_BUILD_ROOT%{aspell_dict_dir}/deutsch.alias -echo "add de_DE.multi" > $RPM_BUILD_ROOT%{aspell_dict_dir}/german.alias -echo "add de_CH.multi" > $RPM_BUILD_ROOT%{aspell_dict_dir}/swiss.alias +mkdir -p %{buildroot}%{aspell_dict_dir} +install -m 644 aspell/*.{rws,dat,alias,multi} %{buildroot}%{aspell_dict_dir} +install -m 644 ./deNovellwords %{buildroot}%{aspell_dict_dir} +echo "add de_DE.multi" > %{buildroot}%{aspell_dict_dir}/deutsch.alias +echo "add de_DE.multi" > %{buildroot}%{aspell_dict_dir}/german.alias +echo "add de_CH.multi" > %{buildroot}%{aspell_dict_dir}/swiss.alias # ispell -mkdir -p $RPM_BUILD_ROOT%{ispell_dict_dir} -install -m 644 ispell/de_??.{aff,hash} $RPM_BUILD_ROOT%{ispell_dict_dir} -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 755 ligature/rmligs $RPM_BUILD_ROOT%{_bindir} -gzip ligature/rmligs.1 -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 644 ligature/rmligs.1.gz $RPM_BUILD_ROOT%{_mandir}/man1 -mkdir -p $RPM_BUILD_ROOT%{ispell_emacs_lib_dir} -install -m 644 %{S:3} %{S:4} %{S:5} $RPM_BUILD_ROOT%{ispell_emacs_lib_dir} +mkdir -p %{buildroot}%{ispell_dict_dir} +install -m 644 ispell/de_??.{aff,hash} %{buildroot}%{ispell_dict_dir} +mkdir -p %{buildroot}%{_bindir} +install -m 755 ligature/rmligs %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 644 ligature/rmligs.1 %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{ispell_emacs_lib_dir} +install -m 644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{ispell_emacs_lib_dir} for ext in aff hash; do - ln -s %{ispell_dict_dir}/de_DE.$ext $RPM_BUILD_ROOT%{ispell_dict_dir}/german.$ext - ln -s %{ispell_dict_dir}/de_CH.$ext $RPM_BUILD_ROOT%{ispell_dict_dir}/swiss.$ext - ln -s %{ispell_dict_dir}/de_AT.$ext $RPM_BUILD_ROOT%{ispell_dict_dir}/austrian.$ext + ln -s %{ispell_dict_dir}/de_DE.$ext %{buildroot}%{ispell_dict_dir}/german.$ext + ln -s %{ispell_dict_dir}/de_CH.$ext %{buildroot}%{ispell_dict_dir}/swiss.$ext + ln -s %{ispell_dict_dir}/de_AT.$ext %{buildroot}%{ispell_dict_dir}/austrian.$ext done %files doc -%defattr(-,root,root) %doc Documentation/* %files -n aspell-de -%defattr(-,root,root) %{aspell_dict_dir}/*.rws %{aspell_dict_dir}/*.multi %{aspell_dict_dir}/*.alias @@ -186,17 +164,15 @@ %{aspell_dict_dir}/deNovellwords %files -n ispell-ngerman -%defattr(-,root,root) %{ispell_dict_dir}/de_DE.aff %{ispell_dict_dir}/de_DE.hash %{ispell_dict_dir}/german.aff %{ispell_dict_dir}/german.hash %{ispell_emacs_lib_dir}/german.el %{_bindir}/rmligs -%{_mandir}/man1/rmligs.1.gz +%{_mandir}/man1/rmligs.1%{ext_man} %files -n ispell-nswiss -%defattr(-,root,root) %{ispell_dict_dir}/de_CH.aff %{ispell_dict_dir}/de_CH.hash %{ispell_dict_dir}/swiss.aff @@ -204,7 +180,6 @@ %{ispell_emacs_lib_dir}/swiss.el %files -n ispell-naustrian -%defattr(-,root,root) %{ispell_dict_dir}/de_AT.aff %{ispell_dict_dir}/de_AT.hash %{ispell_dict_dir}/austrian.aff ++++++ igerman98-20160407.tar.bz2 -> igerman98-20161207.tar.bz2 ++++++ ++++ 9251 lines of diff (skipped) ++++++ igerman98-ispell-sort.patch ++++++ --- /var/tmp/diff_new_pack.OgjBp1/_old 2017-07-07 10:16:56.678772124 +0200 +++ /var/tmp/diff_new_pack.OgjBp1/_new 2017-07-07 10:16:56.678772124 +0200 @@ -1,15 +1,15 @@ -Index: igerman98-20100727/LC_CTYPE +Index: igerman98-20161207/LC_CTYPE =================================================================== --- /dev/null -+++ igerman98-20100727/LC_CTYPE ++++ igerman98-20161207/LC_CTYPE @@ -0,0 +1,2 @@ +de_DE.ISO-8859-1 + -Index: igerman98-20100727/Makefile +Index: igerman98-20161207/Makefile =================================================================== ---- igerman98-20100727.orig/Makefile -+++ igerman98-20100727/Makefile -@@ -55,7 +55,7 @@ DESTDIR = +--- igerman98-20161207.orig/Makefile ++++ igerman98-20161207/Makefile +@@ -59,7 +59,7 @@ DESTDIR = # please report problems with other make versions to me. MAKE = make FIND = find @@ -18,7 +18,7 @@ TAR = tar SED = sed NL = nl -@@ -142,9 +142,10 @@ ispell/$(1).hash: ispell/$(1).aff all.wo +@@ -146,9 +146,10 @@ ispell/$(1).hash: ispell/$(1).aff all.wo $(BUILDHASH) all.words.munch.$(1).tmp ./ispell/$(1).aff $$@ all.words.$(1).tmp: $$(WORDS_$(1)) $$(WORDS_de_all) dicts/abkuerzpunkt.txt @@ -29,8 +29,8 @@ + | grep -v "\/.*d" | grep -v "##" | $(SED) "s/#.*//" | ./bin/myspellfixprefix.pl | $(SORT) > $$@ 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 +158,8 @@ ispell/$(1)_null.hash: ispell/$(1)_null. + ./bin/test-working-grep.sh +@@ -162,7 +163,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 @@ -40,7 +40,7 @@ endef $(foreach langcode,$(LANGS),$(eval $(call LANG_ispell_dict_template,$(langcode)))) -@@ -395,23 +397,25 @@ ispell/liglist_null.hash: ispell/liglist +@@ -401,23 +403,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))) @@ -69,7 +69,7 @@ > $$@ ligature/rmligs: liglist.tmp ligature/rmligs.skel -@@ -443,7 +447,7 @@ sort: +@@ -449,7 +453,7 @@ sort: @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 @if grep -q -v "/.*d" dicts/blacklist* ; then echo "missing d in blacklist?" ; exit 1 ; fi
