bump to latest version

2014-10-08 10:40:25 +01:00 · 2014-10-08 10:40:25 +01:00 · 957c22fbb2
commit 957c22fbb2
parent 09b55ca080
7 changed files with 60 additions and 42 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
 /en_GB.zip
-/wordlist-20121024.tar.xz
+/rel-2014.08.11.1.tar.gz
--- a/en_US-strippedabbrevs.patch
+++ b/en_US-strippedabbrevs.patch
@ -1,5 +1,5 @@
--- wordlist/scowl/speller/en.dic.supp.orig	2008-11-28 10:10:01.000000000 +0000
-+++ wordlist/scowl/speller/en.dic.supp	2008-11-28 10:10:10.000000000 +0000
+--- scowl/speller/en.dic.supp.orig	2008-11-28 10:10:01.000000000 +0000
+++ scowl/speller/en.dic.supp	2008-11-28 10:10:10.000000000 +0000
@@ -21,3 +21,5 @@
 7th/pt
 8th/pt
--- a/hunspell-en-SI_and_IEC.patch
+++ b/hunspell-en-SI_and_IEC.patch
@ -1,7 +1,7 @@
--- wordlist/scowl/r/special/abbreviations	2008-11-29 23:02:41.000000000 +0000
-+++ wordlist/scowl/r/special/abbreviations	2010-07-30 11:18:33.000000000 +0100
-@@ -2,6 +2,11 @@
- AI
+--- scowl/r/special/abbreviations	2008-11-29 23:02:41.000000000 +0000
+++ scowl/r/special/abbreviations	2010-07-30 11:18:33.000000000 +0100
+@@ -3,6 +3,11 @@
+ API
 ATM
 BTW
 +EB
@ -12,20 +12,24 @@
 EULA
 EULAs
 FAQ
-@@ -13,27 +18,63 @@
- GB
- GHz
+@@ -16,39 +21,75 @@
+ GIF
+ GPU
 GUI
 +Gb
 +Gi
 +GiB
 +Gib
+ GnuPG
+ HDD
+ HDMI
 HTML
 HTTP
 +IEC
 IMHO
 IMNSHO
 IMO
+ IRC
 ISO
 +JEDEC
 +KB
@ -33,14 +37,19 @@
 +Ki
 +KiB
 +Kib
+ JPEG
 MB
 MP3
 MP3s
+ MPEG
 Mb
 +Mi
 +MiB
 +Mib
 OTOH
+ PCMCIA
+ PDF
+ PGP
 +PB
 +Pb
 +Pi
@ -49,6 +58,7 @@
 RFC
 ROFL
 RTFM
+ SQL
 +TB
 +Tb
 +Ti
@ -56,21 +66,23 @@
 +Tib
 URL
 USB
+ USB
 WWW
 WYSIWYG
 XML
 +YB
 +Yb
- YMMV
 +Yi
 +YiB
 +Yib
+ YMMV
 +ZB
 +Zb
 +Zi
 +ZiB
 +Zib
 cf
+ dpi
 +kB
 +kb
 pp
--- a/hunspell-en-allow-non-typographical.marks.patch
+++ b/hunspell-en-allow-non-typographical.marks.patch
@ -1,5 +1,5 @@
--- wordlist/en_GB.aff	2010-04-15 14:51:13.000000000 +0100
-+++ wordlist/en_GB.aff	2010-04-15 14:52:07.000000000 +0100
+--- en_GB.aff	2010-04-15 14:51:13.000000000 +0100
+++ en_GB.aff	2010-04-15 14:52:07.000000000 +0100
@@ -6,6 +6,7 @@
 # R 1.18, 11/04/05
 SET ISO8859-1
@ -8,8 +8,8 @@
 REP 27
 REP f ph
 REP ph f
--- wordlist/scowl/speller/en.aff.orig	2010-04-15 14:56:37.000000000 +0100
-+++ wordlist/scowl/speller/en.aff	2010-04-15 14:57:08.000000000 +0100
+--- scowl/speller/en.aff	2010-04-15 14:56:37.000000000 +0100
+++ scowl/speller/en.aff	2010-04-15 14:57:08.000000000 +0100
@@ -12,7 +12,7 @@
 COMPOUNDRULE 2
 COMPOUNDRULE n*1t
--- a/hunspell-en.spec
+++ b/hunspell-en.spec
@ -1,10 +1,9 @@
 Name: hunspell-en
 Summary: English hunspell dictionaries
-%define upstreamid 20121024
+%define upstreamid 20140811.1
 Version: 0.%{upstreamid}
-Release: 9%{?dist}
-#svn export https://wordlist.svn.sourceforge.net/svnroot/wordlist/trunk wordlist
-Source0: wordlist-%{upstreamid}.tar.xz
+Release: 1%{?dist}
+Source0: https://github.com/kevina/wordlist/archive/rel-2014.08.11.1.tar.gz
 Source1: http://en-gb.pyxidium.co.uk/dictionary/en_GB.zip
 #See http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/mozilla_words.diff?raw=1
 Patch0: mozilla_words.patch
@ -53,14 +52,14 @@ Group: Applications/Text
 UK English hunspell dictionaries

 %prep
-%setup -q -n wordlist
-%setup -q -T -D -a 1 -n wordlist
-%patch0 -p1 -b .mozilla
+%setup -q -n wordlist-rel-2014.08.11.1
+%setup -q -T -D -a 1 -n wordlist-rel-2014.08.11.1
+%patch0 -p0 -b .mozilla
 %patch1 -p1 -b .singleletters
 %patch2 -p1 -b .two_initial_cap
-%patch3 -p1 -b .strippedabbrevs
-%patch4 -p1 -b .allow-non-typographical
-%patch5 -p1 -b .SI_and_IEC
+%patch3 -p0 -b .strippedabbrevs
+%patch4 -p0 -b .allow-non-typographical
+%patch5 -p0 -b .SI_and_IEC
 %patch6 -p1 -b .calender
 %patch7 -p1 -b .en_IE

@ -82,9 +81,9 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p en_*.dic en_*.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
+cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell

 pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
 en_GB_aliases="en_AG en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN en_JM en_MW en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZM en_ZW"
@ -120,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/en_GB.*

 %changelog
+* Wed Oct 08 2014 Caolán McNamara <caolanm@redhat.com> - 0.20140811-1
+- bump to latest version
+
 * Wed Oct 08 2014 Caolán McNamara <caolanm@redhat.com> - 0.20121024-9
 - Resolves: rhbz#1149720 add BitTorrent as a word

--- a/mozilla_words.patch
+++ b/mozilla_words.patch
@ -1,41 +1,45 @@
--- 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
-@@ -4,8 +4,11 @@
- Barack
- Bernanke
- Biden
-+BitTorrent
+--- scowl/r/special/proper-names	2008-02-08 11:53:27.000000000 +0000
+++ scowl/r/special/proper-names	2008-02-08 12:06:00.000000000 +0000
+@@ -8,6 +8,8 @@
+ BitTorrent
 Bluetooth
 Bugzilla
 +Camino
 +ChatZilla
+ Closure
 Debian
- ECMAScript
- Emacs
-@@ -13,16 +16,21 @@
- Facebook
+ Dropbox
+@@ -19,23 +21,28 @@
 GNU
 Gentoo
+ GitHub
 +Haskell
 Hunspell
 ISO
+ Instagram
 Ispell
+ LibreOffice
 LyX
 +Mandriva
 Mozilla
 +MySpell
+ NSA
 Netflix
+ OpenOffice
 PayPal
-+SeaMonkey
+ PowerPC
 Roku
+SeaMonkey
 SUSE
+ Scala
 Slackware
+ Sourceforge
 +Sunbird
 Thunderbird
 Twitter
 Ubuntu
--- 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
+--- scowl/speller/en.aff	2008-02-08 20:28:24.000000000 +0000
+++ scowl/speller/en.aff	2008-02-08 20:28:45.000000000 +0000
@@ -110,13 +110,17 @@
 SFX L Y 1
 SFX L   0     ment       .
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 218909136738f4564b81ecd145ade6ee  en_GB.zip
-10a7ff0b2209af7d22b14b219b98c9b5  wordlist-20121024.tar.xz
+b39e3879a5f2e20eaebffb8fa6d24f5e  rel-2014.08.11.1.tar.gz