rpms/hunspell-en/devel .cvsignore, 1.4, 1.5 hunspell-en.spec, 1.14, 1.15 mozilla_words.patch, 1.1, 1.2 sources, 1.6, 1.7

Fri Feb 8 20:40:17 UTC 2008

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-en/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28823

Modified Files:
	.cvsignore hunspell-en.spec mozilla_words.patch sources 
Log Message:
use new canonical upstream for en_US/en_CA


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- .cvsignore	15 Jan 2008 20:52:59 -0000	1.4
+++ .cvsignore	8 Feb 2008 20:39:34 -0000	1.5
@@ -1,4 +1,2 @@
 en_GB.zip
-en_US.zip
-en_GB-oed.zip
-en_CA.zip
+wordlist-20080207.tar.bz2


Index: hunspell-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/hunspell-en.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hunspell-en.spec	7 Feb 2008 15:31:53 -0000	1.14
+++ hunspell-en.spec	8 Feb 2008 20:39:34 -0000	1.15
@@ -1,37 +1,45 @@
 Name: hunspell-en
 Summary: English hunspell dictionaries
-%define upstreamid 20061130
+%define upstreamid 20080207
 Version: 0.%{upstreamid}
-Release: 5%{?dist}
-Source0: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/en_US.zip
+Release: 1%{?dist}
+#svn co https://wordlist.svn.sourceforge.net/svnroot/wordlist/trunk wordlist
+Source0: wordlist-%{upstreamid}.tar.bz2
 Source1: http://en-gb.pyxidium.co.uk/dictionary/en_GB.zip
-Source2: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/en_CA.zip
 #See http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/mozilla_words.diff?raw=1
 Patch0: mozilla_words.patch
 Group: Applications/Text
-URL: http://en-gb.pyxidium.co.uk/dictionary
+URL: http://wordlist.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: LGPLv2+ and BSD
 BuildArch: noarch
-
+BuildRequires: hunspell, aspell
 Requires: hunspell
 
 %description
 English (US, UK, etc.) hunspell dictionaries
 
 %prep
-%setup -q -c -n %{name}
-%setup -q -T -D -a 1 -n %{name}
-%setup -q -T -D -a 2 -n %{name}
-%patch -p0 -b mozilla
+%setup -q -n wordlist
+%setup -q -T -D -a 1 -n wordlist
+%patch0 -p1 -b .mozilla
 
 %build
+make
+cd scowl/speller
+sed -i -e "s/HUNSPELL=.*/HUNSPELL=hunspell/" make-hunspell-dict
+sed -i -e "s/ASPELL=.*/ASPELL=aspell/" make-hunspell-dict
+make hunspell
+iconv -f ISO-8859-1 -t UTF-8 README_en_CA.txt > ../../README_en_CA.txt
+iconv -f ISO-8859-1 -t UTF-8 README_en_US.txt > ../../README_en_US.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
 chmod -x *
-cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+cp -p en_*.dic en_*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+cd scowl/speller
+cp -p en_*.dic en_*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
 
 pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
 en_GB_aliases="en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN en_JM en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW"
@@ -51,10 +59,13 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README_en_US.txt README_en_GB.txt README_en_CA.txt
+%doc README_en_GB.txt README_en_CA.txt README_en_US.txt
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Feb 08 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080207-1
+- canonical upstream source
+
 * Thu Feb 07 2008 Caolan McNamara <caolanm at redhat.com> - 0.20061130-5
 - apply mozilla word diff
 

mozilla_words.patch:

Index: mozilla_words.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/mozilla_words.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla_words.patch	7 Feb 2008 15:31:53 -0000	1.1
+++ mozilla_words.patch	8 Feb 2008 20:39:34 -0000	1.2
@@ -1,132 +1,66 @@
-diff -up4 en_US.dic en_US.dic
---- en_US.dic	Sat Nov 24 21:50:56 2007
-+++ en_US.dic	Sat Dec  8 10:05:34 2007
-@@ -7507,6 +7507,7 @@
- Buford/M
- bugaboo/SM
- Bugatti/M
-+Bugzilla/M
- bugbear/SM
- bug/CS
- bugeyed
-@@ -8166,6 +8167,7 @@
- Camile/M
- Camilla/M
- Camille/M
-+Camino/M
- Cami/M
- Camino/M
- camion/M
-@@ -9551,6 +9553,7 @@
- Chatterley/M
- chatter/SZGDRY
- Chatterton/M
-+ChatZilla/M
- chattily
- chattiness/SM
- chatting
-@@ -26557,6 +26560,7 @@
- HTML
- Hts/M
- HTTP
-+HTTPS
- Huang/M
- huarache/SM
- hubba
-@@ -26702,6 +26706,7 @@
- hung/A
- Hungarian/MS
- Hungary/M
+--- wordlist.orig/scowl/r/special/proper-names	2008-02-08 11:53:27.000000000 +0000
++++ wordlist/scowl/r/special/proper-names	2008-02-08 12:06:00.000000000 +0000
+@@ -1,18 +1,25 @@
+ Aspell
+ BSD
+ Bugzilla
++Camino
++ChatZilla
+ Debian
+ Emacs
+ Firefox
+ Gentoo
+ Google
 +Hunspell
- hunger/SDMG
- Hung/M
- hungover
-@@ -33981,6 +33986,7 @@
- Mandie/M
- Mandi/M
- Mandingo/M
-+Mandriva/M
- mandolin/MS
- mandrake/MS
- mandrel/SM
-@@ -37362,6 +37368,7 @@
- my/S
- myself
- Mysore/M
-+MySpell/M
- mysteriousness/MS
- mysterious/YP
- mystery/MDSG
-@@ -42232,6 +42239,8 @@
- Phip/M
- Phipps/M
- phi/SM
-+phish/DGS
-+phisher/MS
- phlebitides
- phlebitis/M
- phlegmatic
-@@ -49255,6 +49264,7 @@
- Seagate/M
- seagoing
- Seagram/M
-+SeaMonkey/M
- seagull/S
- seahorse/S
- sealant/MS
-@@ -52008,7 +52018,11 @@
- Spain/M
- spake
- Spalding/M
--Spam/M
-+spam/S
-+spamblock/S
-+spammed
-+spammer/MS
-+spamming
- spa/MS
- Span
- spandex/MS
-@@ -53946,6 +53960,7 @@
- sunbath/ZRSDG
- sunbeam/MS
- Sunbelt/M
-+Sunbird/M
- sunblock/S
- sunbonnet/MS
- sunburn/GSMD
-@@ -58370,6 +58385,8 @@
- unindustrialized/MS
- uninhibited/YP
- uninominal
-+uninstall/GSBD
-+uninstaller/MS
- uninsured
- unintellectual
- unintended
-@@ -58572,6 +58589,8 @@
- unstudied
- unstuffy
- unsubdued
-+unsubscribe/DGS
-+unsubscriber/MS
- unsubstantial
- unsubtle
- unsuitable
-@@ -60432,6 +60451,8 @@
- webfeet
- webfoot/M
- Web/MR
-+webmaster/MS
-+webmistress/S
- website/S
- web/SMR
- Webster/MS
-diff -up4 en_US.aff en_US.aff
---- en_US.aff	Fri Jan 11 00:27:09 2008
-+++ en_US.aff	Sat Jan 12 09:00:41 2008
-@@ -109,15 +109,16 @@ SFX B   e     able       [^aeiou]e
- 
+ ISO
+ Ispell
+ JavaScript
+ LyX
++Mandriva
+ Mozilla
++MySpell
+ PayPal
++SeaMonkey
+ SUSE
++Sunbird
+ Slackware
+ Slashdot
+ Thunderbird
+--- wordlist.orig/scowl/r/special/signature.35	2008-02-07 16:02:05.000000000 +0000
++++ wordlist/scowl/r/special/signature.35	2008-02-08 18:18:57.000000000 +0000
+@@ -13,3 +13,29 @@
+ newbie
+ newbies
+ non
++phish
++phished
++phishing
++phishes
++phisher
++phisher's
++phishers
++spammer
++spammers
++spammer's
++uninstall
++uninstalled
++uninstalling
++uninstalls
++uninstaller
++uninstaller's
++unsubscribe
++unsubscribed
++unsubscribing
++unsubscribes
++unsubscriber
++unsubscriber's
++webmaster
++webmaster's
++webmistress
++webmistresses
+--- wordlist.orig/scowl/speller/en.aff	2008-02-08 20:28:24.000000000 +0000
++++ wordlist/scowl/speller/en.aff	2008-02-08 20:28:45.000000000 +0000
+@@ -110,13 +110,14 @@
  SFX L Y 1
  SFX L   0     ment       .
  
@@ -142,4 +76,3 @@
  REP are air
  REP are ear
  REP are eir
- REP air are


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2008 20:52:59 -0000	1.6
+++ sources	8 Feb 2008 20:39:34 -0000	1.7
@@ -1,3 +1,2 @@
 218909136738f4564b81ecd145ade6ee  en_GB.zip
-cb1e21fee281f32d832a34ad6de1b553  en_US.zip
-c14942ea471a5182f376802c68933880  en_CA.zip
+57e9805b34b172fd337091d5e417bd36  wordlist-20080207.tar.bz2


