X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=aspell.spec;h=42d73da91e4f38f3fa3e785cf2ae668189527f3d;hb=ce7517abb08a65ef536ac1bda2ac6f9a7aeaa766;hp=9536b4798f49420a59f7e78c406a9b8e3bcf84c6;hpb=34c0d1688c9b017f71227b2f6cb948013acdafad;p=packages%2Faspell.git

diff --git a/aspell.spec b/aspell.spec
index 9536b47..42d73da 100644
--- a/aspell.spec
+++ b/aspell.spec
@@ -2,24 +2,28 @@ Summary:	GNU Aspell is an Open Source spell checker
 Summary(pl):	GNU Aspell jest kontrolerem pisowni
 Summary(pt_BR):	Verificador ortográfico
 Name:		aspell
-Version:	0.50.3
-Release:	1.1
-Epoch:		2
+Version:	0.60.4
+Release:	3
+Epoch:		3
 License:	LGPL
 Group:		Applications/Text
-Vendor:		Kevin Atkinson <kevina@gnu.org>
 Source0:	ftp://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
-# Source0-md5: a3bf0d46303ffb0beab8121bbc3311a3
+# Source0-md5:	4f1737e726d66476b9c7388831305510
+Patch0:		%{name}-info.patch
+Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-gcc4.patch
 URL:		http://aspell.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 2:1.4e-0.20021218.3
 BuildRequires:	gettext-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
+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)
 
 %description
 GNU Aspell is a Free and Open Source spell checker designed to
@@ -44,12 +48,25 @@ antigo "ispell". Sua principal vantagem (sobre o Ispell) 
 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):	Biblioteki aspella
+Group:		Libraries
+Conflicts:	aspell < 0.60.4-1.2
+
+%description libs
+aspell/pspell libraries
+
+%description libs -l pl
+Biblioteki aspell/pspell.
+
 %package devel
 Summary:	Header files for aspell development
 Summary(pl):	Pliki nag³ówkowe dla programistów u¿ywaj±cych aspella
 Summary(pt_BR):	Arquivos para desenvolvimento usando Aspell
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	libstdc++-devel
 Provides:	pspell-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	libaspell15-devel
 Obsoletes:	pspell-devel
@@ -72,9 +89,9 @@ Summary:	Static libraries for aspell development
 Summary(pl):	Biblioteki statyczne aspella
 Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento usando Aspell
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
-Obsoletes:	pspell-static
+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
@@ -91,6 +108,9 @@ aspell.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -99,38 +119,48 @@ aspell.
 %{__automake}
 %configure \
 	--enable-shared \
-	--enable-static
+	--enable-static \
+	--enable-pkgdatadir=%{_datadir}/aspell \
+	--enable-pkglibdir=%{_libdir}/aspell
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/aspell
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT{%{_bindir}/run-with-aspell,%{_datadir}/aspell/{i,}spell}
+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
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README manual/man-html/*.{html,png,css}
-%attr(755,root,root) %{_bindir}/a*
-%attr(755,root,root) %{_bindir}/w*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc README manual/aspell.html
+%{_infodir}/aspell.info*
+%attr(755,root,root) %{_bindir}/aspell*
+%attr(755,root,root) %{_bindir}/pre*
+%attr(755,root,root) %{_bindir}/word-list-compress
+%attr(755,root,root) %{_bindir}/run-with-aspell
 %{_datadir}/aspell
-%dir %{_libdir}/aspell
+%{_mandir}/man1/*
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%{_libdir}/aspell
 
 %files devel
 %defattr(644,root,root,755)
-%doc manual/dev-html/*.{html,png,css}
-%attr(755,root,root) %{_bindir}/p*
+%doc manual/aspell-dev.html
+%{_infodir}/aspell-dev.info*
+%attr(755,root,root) %{_bindir}/pspell-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/pspell