-%define ver .33.7.1
-
-Summary: Aspell is an Open Source spell checker
-Summary(pl): Aspell jest kontrolerem pisowni
+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%{ver}
-Release: 12
-Epoch: 2
-License: LGPL
+Version: 0.60.6.1
+Release: 4
+Epoch: 3
+License: LGPL v2 or v2.1
Group: Applications/Text
-Vendor: Kevin Atkinson <kevinatk@home.com>
-Source0: ftp://ftp.sourceforge.net/pub/sourceforge/aspell/%{name}-%{ver}.tar.gz
-Patch0: ftp://ftp.sourceforge.net/pub/sourceforge/aspell/%{name}-.33-fix2.diff
-Patch1: %{name}-noinstalled.patch
-Patch2: %{name}-amfix.patch
-URL: http://aspell.sourceforge.net/
-BuildRequires: autoconf
+Source0: http://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
+# Source0-md5: e66a9c9af6a60dc46134fdacf6ce97d7
+Patch0: %{name}-info.patch
+Patch1: %{name}-ac.patch
+#Patch2: %{name}-home_etc.patch
+URL: http://aspell.net/
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
+BuildRequires: gettext-tools >= 0.16.1
BuildRequires: libstdc++-devel
-BuildRequires: libtool
-BuildRequires: pspell-devel
+BuildRequires: libtool >= 2:1.5
+BuildRequires: ncurses-devel
+BuildRequires: texinfo
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Provides: pspell = %{epoch}:%{version}-%{release}
+Obsoletes: libaspell15
+Obsoletes: pspell
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes: libaspell10
%description
-Aspell is an Open Source spell checker designed to eventually replace
-Ispell. Its main feature is that it does a much better job of coming
-up with possible suggestions than Ispell does. In fact recent tests
-shows that it even does better than Microsoft Word 97's spell checker
-in some cases. In addition it has both compile time and run time
-support for other non English languages. Aspell also doubles as a
-powerful C++ library with C and Perl interfaces in the works.
-
-%description -l pl
-Aspell jest kontrolerem pisowni zaprojektowanym tak, by móc zast±piæ
-ispella. Dodatkowo zawiera wsparcie dla innych jêzyków ni¿ angielski.
-Interfejs aspella napisany zosta³ w C++, a interfejsy w Perlu i C s±
-aktualnie rozwijane.
+GNU Aspell is a Free and Open Source spell checker designed to
+eventually replace Ispell. It can either be used as a library or as an
+independent spell checker. Its main feature is that it does a much
+better job of coming up with possible suggestions than just about any
+other spell checker out there for the English language, including
+Ispell and Microsoft Word. It also has many other technical
+enhancements over Ispell such as using shared memory for dictionaries
+and intelligently handling personal dictionaries when more than one
+Aspell process is open at once.
+
+%description -l pl.UTF-8
+GNU Aspell jest kontrolerem pisowni zaprojektowanym tak, by móc
+zastąpić ispella. Dodatkowo zawiera wsparcie dla innych języków niż
+angielski. Interfejs aspella napisany został w C++, a interfejsy w
+Perlu i C są aktualnie rozwijane.
+
+%description -l pt_BR.UTF-8
+GNU Aspell é um verificador ortográfico criado para substituir o
+antigo "ispell". Sua principal vantagem (sobre o Ispell) é uma melhor
+sugestão de correções. Aspell inclui suporte a vários idiomas e pode
+fazer a checagem de arquivos LaTeX e HTML.
+
+%package libs
+Summary: aspell libraries
+Summary(pl.UTF-8): Biblioteki aspella
+Group: Libraries
+Conflicts: aspell < 0.60.4-1.2
+
+%description libs
+aspell/pspell libraries
+
+%description libs -l pl.UTF-8
+Biblioteki aspell/pspell.
%package devel
Summary: Header files for aspell development
-Summary(pl): Pliki nag³ówkowe dla programistów u¿ywaj±cych aspella
+Summary(pl.UTF-8): Pliki nagłówkowe dla programistów używających aspella
+Summary(pt_BR.UTF-8): Arquivos para desenvolvimento usando Aspell
Group: Development/Libraries
-Requires: %{name} = %{version}
-Obsoletes: libaspell10-devel
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libstdc++-devel
+Provides: pspell-devel = %{epoch}:%{version}-%{release}
+Obsoletes: libaspell15-devel
+Obsoletes: pspell-devel
%description devel
Aspell is an Open Source spell checker. This package contains header
files for aspell development.
-%description -l pl devel
-Aspell jest kontrolerem pisowni. Ten pakiet zawiera pliki nag³ówkowe
-dla programistów u¿ywaj±cych bibliotek aspella.
+%description devel -l pl.UTF-8
+Aspell jest kontrolerem pisowni. Ten pakiet zawiera pliki nagłówkowe
+dla programistów używających bibliotek aspella.
+
+%description devel -l pt_BR.UTF-8
+Aspell é um corretor ortográfico. O pacote -devel inclui bibliotecas
+dinâmicas e arquivos de inclusão necessários para o desenvolvimento
+utilizando o aspell.
%package static
Summary: Static libraries for aspell development
-Summary(pl): Biblioteki statyczne aspella
+Summary(pl.UTF-8): Biblioteki statyczne aspella
+Summary(pt_BR.UTF-8): Bibliotecas estáticas para desenvolvimento usando Aspell
Group: Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Provides: pspell-static = %{epoch}:%{version}-%{release}
+Obsoletes: pspell-static
%description static
Aspell is an Open Source spell checker. This package contains static
aspell libraries.
-%description -l pl static
+%description static -l pl.UTF-8
Aspell jest kontrolerem pisowni. Pakiet ten zawiera biblioteki
statyczne aspella.
-%package en
-Summary: English dictionary for aspell
-Summary(pl): Angielski s³ownik dla aspella
-Group: Applications/Text
-Requires: %{name} = %{version}
-
-%description en
-English dictionary (i.e. word list) for aspell.
-
-%description en -l pl
-Angielski s³ownik (lista s³ów) dla aspella.
+%description static -l pt_BR.UTF-8
+Aspell é um corretor ortográfico. O pacote -devel-static inclui as
+bibliotecas estáticas necessárias para o desenvolvimento utilizando o
+aspell.
%prep
-%setup -q -n %{name}-%{ver}
-%patch0 -p0
+%setup -q
+%patch0 -p1
%patch1 -p1
-%patch2 -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.
+#%%patch2 -p1
%build
+%{__gettextize}
%{__libtoolize}
-aclocal
+%{__aclocal} -I m4
%{__autoconf}
%{__automake}
%configure \
- --enable-shared \
- --enable-static
+ --enable-static \
+ --enable-pkgdatadir=%{_datadir}/aspell \
+ --enable-pkglibdir=%{_libdir}/aspell
-%{__make}
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT{%{_bindir}/run-with-aspell,%{_datadir}/aspell/ispell}
+rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%post -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
-%files
+%postun -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%post devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc manual/manual2.lyx manual/man-text/*.txt
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libaspell.so.*.*
-%attr(755,root,root) %{_libdir}/libpspell_aspell.so.*.*
-%attr(755,root,root) %{_libdir}/libpspell_aspell.la
-%dir %{_libdir}/aspell
+%doc README manual/aspell.html
+%{_infodir}/aspell.info*
+%attr(755,root,root) %{_bindir}/aspell
+%attr(755,root,root) %{_bindir}/aspell-import
+%attr(755,root,root) %{_bindir}/pre*
+%attr(755,root,root) %{_bindir}/run-with-aspell
+%attr(755,root,root) %{_bindir}/word-list-compress
%dir %{_datadir}/aspell
-%{_datadir}/aspell/[^e]*
+%attr(755,root,root) %{_datadir}/aspell/ispell
+%attr(755,root,root) %{_datadir}/aspell/spell
+%{_datadir}/aspell/*.cmap
+%{_datadir}/aspell/*.cset
+%{_datadir}/aspell/*.kbd
+%{_mandir}/man1/aspell.1*
+%{_mandir}/man1/aspell-import.1*
+%{_mandir}/man1/pre*.1*
+%{_mandir}/man1/run-with-aspell.1*
+%{_mandir}/man1/word-list-compress.1*
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libaspell.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libaspell.so.15
+%attr(755,root,root) %{_libdir}/libpspell.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpspell.so.15
+%{_libdir}/aspell
%files devel
%defattr(644,root,root,755)
+%doc manual/aspell-dev.html
+%attr(755,root,root) %{_bindir}/pspell-config
%attr(755,root,root) %{_libdir}/libaspell.so
-%attr(755,root,root) %{_libdir}/libaspell.la
-%{_includedir}/aspell
+%attr(755,root,root) %{_libdir}/libpspell.so
+%{_libdir}/libaspell.la
+%{_libdir}/libpspell.la
+%{_includedir}/pspell
+%{_includedir}/aspell.h
+%{_mandir}/man1/pspell-config.1*
+%{_infodir}/aspell-dev.info*
%files static
%defattr(644,root,root,755)
%{_libdir}/libaspell.a
-
-%files en
-%defattr(644,root,root,755)
-%{_libdir}/aspell/*
-%{_datadir}/aspell/english*
-%{_datadir}/pspell/*
+%{_libdir}/libpspell.a