X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=aspell.spec;h=4115139b607fc862e173c6fd853ce941b4882777;hb=465112b3a53df3ebb6cf82855f81c7966056d9e4;hp=967bf8be0c22e07a3c8caea5d5f15d23c20030f7;hpb=2abc670fb85dfc4cbab34aa97eba522b02c33051;p=packages%2Faspell.git

diff --git a/aspell.spec b/aspell.spec
index 967bf8b..4115139 100644
--- a/aspell.spec
+++ b/aspell.spec
@@ -2,23 +2,24 @@ 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.60
-Release:	2
-Epoch:		2
+Version:	0.60.4
+Release:	5
+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:	8fa031d0eb37a5538aa6fefa657e707f
-# Security patch from gentoo: http://www.gentoo.org/cgi-bin/viewcvs.cgi/app-text/aspell/files/aspell-buffer-fix.patch
-# ref.: http://securitytracker.com/alerts/2004/Jun/1010435.html
-Patch0:		%{name}-buffer-fix.patch
+# 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:	gettext-devel
 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
@@ -47,12 +48,24 @@ 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} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	libstdc++-devel
 Provides:	pspell-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	libaspell15-devel
@@ -96,10 +109,13 @@ aspell.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
@@ -116,13 +132,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+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 -f %{name}.lang
 %defattr(644,root,root,755)
@@ -132,11 +149,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pre*
 %attr(755,root,root) %{_bindir}/word-list-compress
 %attr(755,root,root) %{_bindir}/run-with-aspell
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_datadir}/aspell
-%{_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/aspell-dev.html