rpms/hunspell-de/F-10 igerman98-20090107-useaspell.patch, NONE, 1.1 hunspell-de.spec, 1.5, 1.6 sources, 1.4, 1.5 hunspell-de.nobuildhash.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-de/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6209/F-10

Modified Files:
	hunspell-de.spec sources 
Added Files:
	igerman98-20090107-useaspell.patch 
Removed Files:
	hunspell-de.nobuildhash.patch 
Log Message:
fix dictionary build

igerman98-20090107-useaspell.patch:

--- NEW FILE igerman98-20090107-useaspell.patch ---
diff -ru igerman98-20090107-ispell/Makefile igerman98-20090107/Makefile
--- igerman98-20090107-ispell/Makefile	2009-04-23 11:40:50.000000000 +0100
+++ igerman98-20090107/Makefile	2009-04-23 11:41:48.000000000 +0100
@@ -275,7 +275,7 @@
 	# sed hack to merge /f/g to /fg : sed "s:/\(.*\)/:/\1:"
 	cat $$(WORDS_BLACKLISTS_$(1)) $$(WORDS_BLACKLISTS_de_all) >$$@
 
-hunspell-capmain-plus_$(1).tmp: ispell/$(1)_null.aff ispell/$(1)_null.hash hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
+hunspell-capmain-plus_$(1).tmp: aspell/$(1).dat aspell/$(1)_affix.dat hunspell/$(1)_small.dic hunspell/$(1)_small.aff $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all)
 	echo DEBUG: WORDS_CAPMAIN_PLUS_$(1) :: $$(WORDS_CAPMAIN_PLUS_$(1)) :::
 	echo DEBUG: WORDS_CAPMAIN_PLUS_de_all :: $$(WORDS_CAPMAIN_PLUS_de_all) :::
 	# limited dictionary of *-xx* files containing compounds not generated by capmain-small
@@ -283,7 +283,7 @@
 	#find dicts/ -name "*-xx*.txt" -print | xargs cat >> $$@.unfiltered-list.tmp
 	echo $$(WORDS_CAPMAIN_PLUS_$(1)) $$(WORDS_CAPMAIN_PLUS_de_all) | xargs cat >> $$@.unfiltered-list0.tmp
 	./bin/myspellfixprefix.pl < $$@.unfiltered-list0.tmp | (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) | grep -v '^$$$$' > $$@.unfiltered-list.tmp
-	cat $$@.unfiltered-list.tmp | $(ISPELL) -d./ispell/$(1)_null -e > $$@.unfiltered-list-expanded.tmp
+	cat $$@.unfiltered-list.tmp | $(ASPELL) --lang=$(1) --local-data-dir=./aspell expand > $$@.unfiltered-list-expanded.tmp
 	$(SED) -f ./bin/dic2iso < $$@.unfiltered-list-expanded.tmp |$(SED) "s/qq//g" | $(NL) | $(HUNSPELL) -d hunspell/$(1)_small -L > $$@.unknown.tmp
 	$(SED) "s/^ *\([0-9]*\)\t.*$$$$/\1/" $$@.unknown.tmp > $$@.list-unknown-lines.tmp
 	./bin/extractlines.pl $$@.list-unknown-lines.tmp $$@.unfiltered-list.tmp > $$@.tmp


Index: hunspell-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/F-10/hunspell-de.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hunspell-de.spec	11 Dec 2007 16:44:59 -0000	1.5
+++ hunspell-de.spec	23 Apr 2009 11:14:54 -0000	1.6
@@ -1,16 +1,16 @@
 Name: hunspell-de
 Summary: German hunspell dictionaries
-%define upstreamid 20071211
+%define upstreamid 20090107
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.j3e.de/ispell/igerman98/dict/igerman98-%{upstreamid}.tar.bz2
 Group: Applications/Text
-URL: http://j3e.de/hunspell/
+URL: http://www.j3e.de/ispell/igerman98
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPLv2
+License: GPLv2 or GPLv3
 BuildArch: noarch
-BuildRequires: /usr/bin/ispell, hunspell
-Patch1: hunspell-de.nobuildhash.patch
+BuildRequires: aspell, hunspell
+Patch1: igerman98-20090107-useaspell.patch
 
 Requires: hunspell
 
@@ -19,19 +19,17 @@
 
 %prep
 %setup -q -n igerman98-%{upstreamid}
-%patch1 -p1 -b .nobuildhash.patch
+%patch1 -p1 -b .useaspell.patch
 
 %build
 make hunspell/de_AT.dic hunspell/de_AT.aff \
      hunspell/de_CH.dic hunspell/de_CH.aff \
      hunspell/de_DE.dic hunspell/de_DE.aff
 cd hunspell
-tr -d '\r' < README_de_AT.txt > README_de_AT.txt.new
-tr -d '\r' < README_de_CH.txt > README_de_CH.txt.new
-tr -d '\r' < README_de_DE.txt > README_de_DE.txt.new
-mv -f README_de_AT.txt.new README_de_AT.txt
-mv -f README_de_CH.txt.new README_de_CH.txt
-mv -f README_de_DE.txt.new README_de_DE.txt
+for i in README_*.txt; do
+    iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
+    tr -d '\r' <$i.new > $i
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,10 +55,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc hunspell/README_de_??.txt hunspell/COPYING_OASIS hunspell/COPYING hunspell/Copyright
+%doc hunspell/README_de_??.txt hunspell/COPYING_OASIS hunspell/COPYING_GPLv2 hunspell/COPYING_GPLv3 hunspell/Copyright
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Apr 23 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090107-1
+- latest version + fix dictionaries
+
 * Tue Dec 11 2007 Caolan McNamara <caolanm at redhat.com> - 0.20071211-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Dec 2007 16:44:59 -0000	1.4
+++ sources	23 Apr 2009 11:14:54 -0000	1.5
@@ -1 +1 @@
-273929341c0df60ef88400310e81ba71  igerman98-20071211.tar.bz2
+fa6bc72afec56e90f035b8fa22e922f6  igerman98-20090107.tar.bz2


--- hunspell-de.nobuildhash.patch DELETED ---