OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Nov-2004 20:36:33
Branch: HEAD Handle: 2004110419363200
Modified files:
openpkg-src/aspell aspell.spec
Log:
add DE dictionary in both old and new spelling
Summary:
Revision Changes Path
1.37 +35 -14 openpkg-src/aspell/aspell.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/aspell/aspell.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 aspell.spec
--- openpkg-src/aspell/aspell.spec 4 Nov 2004 19:32:16 -0000 1.36
+++ openpkg-src/aspell/aspell.spec 4 Nov 2004 19:36:32 -0000 1.37
@@ -24,10 +24,11 @@
##
# package version
-%define V_aspell 0.60
-%define V_aspell_en 6.0-0
-%define V_aspell_de 20030222-1
-%define V_aspell_perl 0.04
+%define V_aspell 0.60
+%define V_aspell_en 6.0-0
+%define V_aspell_de_new 20030222-1
+%define V_aspell_de_old 2.1-1
+%define V_aspell_perl 0.04
# package information
Name: aspell
@@ -48,8 +49,9 @@
# list of sources
Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{V_aspell}.tar.gz
Source1: ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-%{V_aspell_en}.tar.bz2
-Source2: ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-%{V_aspell_de}.tar.bz2
-Source3:
http://www.cpan.org/modules/by-module/Text/Text-Aspell-%{V_aspell_perl}.tar.gz
+Source2:
ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-%{V_aspell_de_new}.tar.bz2
+Source3:
ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-alt-%{V_aspell_de_old}.tar.bz2
+Source4:
http://www.cpan.org/modules/by-module/Text/Text-Aspell-%{V_aspell_perl}.tar.gz
Patch0: aspell.patch
# build information
@@ -81,16 +83,21 @@
url = ftp://ftp.gnu.org/gnu/aspell/
regex = aspell-(\d+\.\d+(\.\d+)*)\.tar\.gz
}
- prog aspell:aspell-de = {
- version = %{V_aspell_de}
- url = ftp://ftp.gnu.org/gnu/aspell/dict/de/
- regex = aspell\d*-de-(__VER__)\.tar\.bz2
- }
prog aspell:aspell-en = {
version = %{V_aspell_en}
url = ftp://ftp.gnu.org/gnu/aspell/dict/en/
regex = aspell\d*-en-(__VER__)\.tar\.bz2
}
+ prog aspell:aspell-de-new = {
+ version = %{V_aspell_de_new}
+ url = ftp://ftp.gnu.org/gnu/aspell/dict/de/
+ regex = aspell\d*-de-(__VER__)\.tar\.bz2
+ }
+ prog aspell:aspell-de-old = {
+ version = %{V_aspell_de_old}
+ url = ftp://ftp.gnu.org/gnu/aspell/dict/de/
+ regex = aspell\d*-de-alt-(__VER__)\.tar\.bz2
+ }
prog aspell:aspell-perl = {
version = %{V_aspell_perl}
url = http://www.cpan.org/modules/by-module/Text/
@@ -101,8 +108,9 @@
%setup -q
%setup -q -T -D -a 1
%setup -q -T -D -a 2
-%if "%{with_perl}" == "yes"
%setup -q -T -D -a 3
+%if "%{with_perl}" == "yes"
+ %setup -q -T -D -a 4
%endif
%patch -p0
@@ -162,8 +170,21 @@
%{l_make} %{l_mflags} install
) || exit $?
- # install GNU aspell German (DE) dictionary
- ( cd aspell6-de-%{V_aspell_de}
+ # install GNU aspell German (DE) dictionary (new spelling)
+ ( cd aspell6-de-%{V_aspell_de_new}
+ export DESTDIR="$RPM_BUILD_ROOT"
+ export PREZIP="../prezip-bin"
+ export ASPELL="../aspell"
+ export ASPELL_FLAGS="--prefix=$RPM_BUILD_ROOT%{l_prefix}"
+ ASPELL_FLAGS="$ASPELL_FLAGS --dict-dir=$RPM_BUILD_ROOT%{l_prefix}/lib/aspell"
+ ASPELL_FLAGS="$ASPELL_FLAGS
--data-dir=$RPM_BUILD_ROOT%{l_prefix}/share/aspell"
+ ./configure
+ %{l_make} %{l_mflags}
+ %{l_make} %{l_mflags} install
+ ) || exit $?
+
+ # install GNU aspell German (DE) dictionary (old spelling)
+ ( cd aspell6-de-alt-%{V_aspell_de_old}
export DESTDIR="$RPM_BUILD_ROOT"
export PREZIP="../prezip-bin"
export ASPELL="../aspell"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]