- updated to 0.60.6.1

- updated ac patch
- removed obsolete mk-static-filter.pl patch

Changed files:
    aspell-ac.patch -> 1.4
    aspell-mk-static-filter.pl.patch -> 1.2
    aspell.spec -> 1.98

diff --git a/aspell-ac.patch b/aspell-ac.patch
index a9ad0f008414946b67cd5293a3a8a500c7930632..24539e3d8e89e0bcfd99e38b7759fa59583f28ff 100644 (file)
--- a/aspell-ac.patch
+++ b/aspell-ac.patch
@@ -1,6 +1,6 @@
---- aspell-0.60.6/configure.ac~        2008-04-07 05:50:05.000000000 +0200
-+++ aspell-0.60.6/configure.ac 2010-11-30 11:36:09.000000000 +0100
-@@ -343,10 +343,10 @@
+--- aspell-0.60.6.1/configure.ac.orig  2011-07-04 10:58:29.000000000 +0200
++++ aspell-0.60.6.1/configure.ac       2011-07-14 18:01:22.971002230 +0200
+@@ -344,20 +344,20 @@
  
      if test "$enable_wide_curses" != "no" -a -n "$have_mblen"
      then
@@ -10,6 +10,18 @@
          [#include <ncursesw/curses.h>], [initscr()],
 -        [CURSES_LIB=-lncursesw
 +        [CURSES_LIB="-lncursesw -ltinfow"
-          AC_DEFINE(CURSES_HEADER, <ncursesw/curses.h>, [Defined to curses header file])])
+          AC_DEFINE(CURSES_HEADER, <ncursesw/curses.h>, [Defined to curses header file])
+          AC_DEFINE(TERM_HEADER, <ncursesw/term.h>, [Defined to term header file])])
      fi
  
+     if test -z "$CURSES_LIB"
+     then
+-      LIBS="-lncurses $ORIG_LIBS"
++      LIBS="-lncurses -ltinfo $ORIG_LIBS"
+       AC_TRY_LINK(
+         [#include <ncurses/curses.h>], [initscr()],
+-        [CURSES_LIB=-lncurses
++        [CURSES_LIB="-lncurses -ltinfo"
+          AC_DEFINE(CURSES_HEADER, <ncurses/curses.h>, [Defined to curses header file])
+          AC_DEFINE(TERM_HEADER, <ncurses/term.h>, [Defined to term header file])],
+         [

diff --git a/aspell-mk-static-filter.pl.patch b/aspell-mk-static-filter.pl.patch
deleted file mode 100644 (file)
index 7ff6633..0000000
--- a/aspell-mk-static-filter.pl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gen/mk-static-filter.pl.orig       2007-12-03 07:43:09.000000000 +0100
-+++ gen/mk-static-filter.pl    2008-04-18 22:34:26.000000000 +0200
-@@ -159,7 +159,7 @@
-   printf STATICFILTERS "\n  const KeyInfo * ".${$filter}{"NAME"}."_options_begin = ".
-                                               ${$filter}{"NAME"}."_options;\n";
-   # If structure is empty, set options_end to same as options_begin.
--  if (%{$filter}) {
-+  if ($firstopt) {
-     printf STATICFILTERS "\n  const KeyInfo * ".${$filter}{"NAME"}."_options_end = ".
-                                                 ${$filter}{"NAME"}."_options;\n";
-   } else {

diff --git a/aspell.spec b/aspell.spec
index 39bf13fef6833fa89457ca04f1b9ffc5f5271814..f3629635c180a38a08d858355810c65b14e47e3d 100644 (file)
--- a/aspell.spec
+++ b/aspell.spec
@@ -2,17 +2,16 @@ Summary:      GNU Aspell is an Open Source spell checker
 Summary(pl.UTF-8):     GNU Aspell jest kontrolerem pisowni
 Summary(pt_BR.UTF-8):  Verificador ortográfico
 Name:          aspell
-Version:       0.60.6
-Release:       6
+Version:       0.60.6.1
+Release:       1
 Epoch:         3
 License:       LGPL v2 or v2.1
 Group:         Applications/Text
 Source0:       http://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
-# Source0-md5: bc80f0198773d5c05086522be67334eb
+# Source0-md5: e66a9c9af6a60dc46134fdacf6ce97d7
 Patch0:                %{name}-info.patch
-# Patch1:              %{name}-home_etc.patch
-Patch2:                %{name}-mk-static-filter.pl.patch
-Patch3:                %{name}-ac.patch
+Patch1:                %{name}-ac.patch
+#Patch2:               %{name}-home_etc.patch
 URL:           http://aspell.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -111,13 +110,12 @@ aspell.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 # home_etc patch is fubar. If HOME_ETC var is not defined, it tries to open
 # such files:
 # open("$HOME|.//.aspell.conf", O_RDONLY) = -1 ENOENT (No such file or directory)
 # Disabled until someone fixes it.
-#%%patch1 -p1
-%patch2 -p0
-%patch3 -p1
+#%%patch2 -p1
 
 %build
 %{__gettextize}
@@ -126,7 +124,6 @@ aspell.
 %{__autoconf}
 %{__automake}
 %configure \
-       --enable-shared \
        --enable-static \
        --enable-pkgdatadir=%{_datadir}/aspell \
        --enable-pkglibdir=%{_libdir}/aspell