upgrade to new version; simplify packaging; fix Perl module linkage

aspell/aspell.patch

@@ -1,24 +1,12 @@
-Index: prog/checker_string.cpp
---- prog/checker_string.cpp.orig	2003-06-05 19:35:02.000000000 +0200
-+++ prog/checker_string.cpp	2003-10-02 20:33:05.000000000 +0200
-@@ -12,6 +12,8 @@
- #include "copy_ptr-t.hpp"
- #include "asc_ctype.hpp"
- 
-+#include <assert.h>
-+
- static int get_line(FILE * in, CharVector & d)
- {
-   d.resize(0);
 Index: Makefile.in
---- Makefile.in.orig	2004-02-11 02:05:49.000000000 +0100
-+++ Makefile.in	2004-02-12 08:19:53.000000000 +0100
-@@ -171,7 +171,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = auto common modules lib examples prog data scripts interfaces manual
-+SUBDIRS = auto common modules lib prog data scripts interfaces manual
- EXTRA_DIST = README suncc/* win32/*
- all: all-recursive
- 
+--- Makefile.in.orig	2004-08-23 03:22:41 +0200
++++ Makefile.in	2004-08-27 21:46:22 +0200
+@@ -425,7 +425,7 @@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+ SUBDIRS = . po manual
+-DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5
++DIST_SUBDIRS = ${SUBDIRS} myspell lib5
+ filterdir = ${pkglibdir}
+ optdir = ${pkgdatadir}
+ localedir = ${datadir}/locale

aspell/aspell.spec

@@ -24,8 +24,8 @@
 ##
 
 #   package version
-%define       V_aspell      0.50.5
-%define       V_aspell_en   0.51-1
+%define       V_aspell      0.60
+%define       V_aspell_en   6.0-0
 %define       V_aspell_de   0.50-2
 %define       V_aspell_perl 0.04
 
@@ -40,14 +40,14 @@ Class:        BASE
 Group:        Text
 License:      GPL
 Version:      %{V_aspell}
-Release:      20040310
+Release:      20040827
 
 #   package options
 %option       with_perl  no
 
 #   list of sources
-Source0:      http://aspell.net/aspell-%{V_aspell}.tar.gz
-Source1:      ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell-en-%{V_aspell_en}.tar.bz2
+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/aspell-de-%{V_aspell_de}.tar.bz2
 Source3:      http://www.cpan.org/modules/by-module/Text/Text-Aspell-%{V_aspell_perl}.tar.gz
 Patch0:       aspell.patch
@@ -77,19 +77,19 @@ AutoReqProv:  no
 
 %track
     prog aspell:aspell = {
-        version   = %{version}
-        url       = http://aspell.net/
-        regex     = aspell-(\d+\.\d+(\.\d+)+)\.tar\.gz
+        version   = %{V_aspell}
+        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-de-(__VER__)\.tar\.bz2
+        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-en-(__VER__)\.tar\.bz2
+        regex     = aspell\d*-en-(__VER__)\.tar\.bz2
     }
     prog aspell:aspell-perl = {
         version   = %{V_aspell_perl}
@@ -98,40 +98,42 @@ AutoReqProv:  no
     }
 
 %prep
-    %setup -q -c
+    %setup -q
     %setup -q -T -D -a 1
     %setup -q -T -D -a 2
 %if "%{with_perl}" == "yes"
     %setup -q -T -D -a 3
 %endif
-    cd aspell-%{V_aspell}
     %patch -p0
 
 %build
-    ( cd aspell-%{V_aspell}
-      #   configure GNU aspell
-      CC="%{l_cc}" \
-      CXX="%{l_cxx}" \
-      CFLAGS="%{l_cflags -O}" \
-      CXXFLAGS="%{l_cxxflags -O}" \
-      CPPFLAGS="%{l_cppflags}" \
-      ./configure \
-          --prefix=%{l_prefix} \
-          --sysconfdir=%{l_prefix}/etc/aspell \
-          --enable-curses-include=%{l_prefix}/include/ncurses \
-          --enable-curses="%{l_ldflags} -lncurses" \
-          --disable-shared
-
-      #   build GNU aspell
-      %{l_make} %{l_mflags -O}
-    ) || exit $?
+    #   configure GNU aspell
+    CC="%{l_cc}" \
+    CXX="%{l_cxx}" \
+    CFLAGS="%{l_cflags -O}" \
+    CXXFLAGS="%{l_cxxflags -O}" \
+    CPPFLAGS="%{l_cppflags}" \
+    ./configure \
+        --prefix=%{l_prefix} \
+        --sysconfdir=%{l_prefix}/etc/aspell \
+        --libdir=%{l_prefix}/lib \
+        --enable-pkglibdir=%{l_prefix}/lib/aspell \
+        --enable-pkgdatadir=%{l_prefix}/share/aspell \
+        --enable-curses-include=%{l_prefix}/include/ncurses \
+        --enable-curses="%{l_ldflags} -lncurses" \
+        --disable-shared
+
+    #   build GNU aspell
+    %{l_make} %{l_mflags -O}
 
     #   optionally build Perl API
 %if "%{with_perl}" == "yes"
     %{l_prefix}/bin/perl-openpkg prepare
+    %{l_shtool} subst \
+        -e 's;\(-laspell\);-L../.libs \1;' \
+        Text-Aspell-%{V_aspell_perl}/Makefile.PL
     %{l_prefix}/bin/perl-openpkg -d Text-Aspell-%{V_aspell_perl} \
-        --args CCFLAGS="-I`pwd`/aspell-%{V_aspell}/interfaces/cc" \
-        --args LIBS="-L`pwd`/aspell-%{V_aspell}/lib/.libs -laspell" \
+        --args CCFLAGS="-I`pwd`/interfaces/cc" \
         configure build
 %endif
 
@@ -139,38 +141,39 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
 
     #   install GNU aspell
-    ( cd aspell-%{V_aspell}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-      %{l_shtool} subst \
-          -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
-          $RPM_BUILD_ROOT%{l_prefix}/bin/aspell-import
-      rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
-      rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/run-with-aspell
-      strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-      %{l_shtool} mkdir -f -p -m 755 \
-          $RPM_BUILD_ROOT%{l_prefix}/lib/aspell
-    ) || exit $?
-
-    #   prepare dictionary installation
-    ( echo "ASPELL = $RPM_BUILD_ROOT%{l_prefix}/bin/aspell"
-      ASPELL_FLAGS="--dict-dir=$RPM_BUILD_ROOT%{l_prefix}/lib/aspell"
-      ASPELL_FLAGS="$ASPELL_FLAGS --data-dir=$RPM_BUILD_ROOT%{l_prefix}/share/aspell"
-      echo "ASPELL_FLAGS = $ASPELL_FLAGS"
-      echo "WORD_LIST_COMPRESS = $RPM_BUILD_ROOT%{l_prefix}/bin/word-list-compress"
-      echo "DESTDIR = $RPM_BUILD_ROOT"
-      echo "dictdir = %{l_prefix}/lib/aspell"
-      echo "datadir = %{l_prefix}/share/aspell"
-    ) >Makefile.head
+    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    %{l_shtool} subst \
+        -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/aspell-import
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/run-with-aspell
+    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/aspell
 
     #   install GNU aspell English (EN) dictionary
-    ( cd aspell-en-%{V_aspell_en}
-      cat ../Makefile.head Makefile.pre >Makefile
+    ( cd aspell6-en-%{V_aspell_en}
+      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
     ( cd aspell-de-%{V_aspell_de}
-      cat ../Makefile.head Makefile.pre >Makefile
+      export DESTDIR="$RPM_BUILD_ROOT"
+      export WORD_LIST_COMPRESS="../word-list-compress"
+      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 $?