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

diff --git a/aspell.spec b/aspell.spec
index ad6aee6..42d73da 100644
--- a/aspell.spec
+++ b/aspell.spec
@@ -2,15 +2,16 @@ 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.2
-Release:	1
+Version:	0.60.4
+Release:	3
 Epoch:		3
 License:	LGPL
-Vendor:		Kevin Atkinson <kevina@gnu.org>
 Group:		Applications/Text
 Source0:	ftp://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
-# Source0-md5:	d067596a1d9029d127d85e5040bab0ab
+# Source0-md5:	4f1737e726d66476b9c7388831305510
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-gcc4.patch
 URL:		http://aspell.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -18,6 +19,7 @@ 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
@@ -46,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
@@ -95,6 +109,8 @@ aspell.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -115,13 +131,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)
@@ -131,11 +148,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