- updated to 0.60.5, removed obsolete gcc4 patch, added missing patch

[packages/aspell.git] / aspell.spec

diff --git a/aspell.spec b/aspell.spec
index 8871dca0500bfbdf95394024d29ac90988bc720c..113dcf7ca3bc1abdb1f547b1183adff2b82ed941 100644 (file)
--- 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.5
+Release:       1
+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: 17fd8acac6293336bcef44391b71e337
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-home_etc.patch
+Patch2:                %{name}-missing.patch
 URL:           http://aspell.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: gettext-devel
+BuildRequires: gettext-devel >= 0.16.1
 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,15 +48,26 @@ 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}
-Requires:      libstdc++-devel
 Obsoletes:     libaspell15-devel
 Obsoletes:     pspell-devel
 
@@ -97,10 +109,13 @@ aspell.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
@@ -117,37 +132,51 @@ 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)
 %doc README manual/aspell.html
 %{_infodir}/aspell.info*
-%attr(755,root,root) %{_bindir}/aspell*
+%attr(755,root,root) %{_bindir}/aspell
+%attr(755,root,root) %{_bindir}/aspell-import
 %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.*.*
+%attr(755,root,root) %{_bindir}/word-list-compress
 %{_datadir}/aspell
+%{_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) %{_libdir}/libpspell.so.*.*.*
 %{_libdir}/aspell
-%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
 %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
+%attr(755,root,root) %{_libdir}/libaspell.so
+%attr(755,root,root) %{_libdir}/libpspell.so
+%{_libdir}/libaspell.la
+%{_libdir}/libpspell.la
 %{_includedir}/pspell
-%{_includedir}/*.h
+%{_includedir}/aspell.h
+%{_mandir}/man1/pspell-config.1*
+%{_infodir}/aspell-dev.info*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libaspell.a
+%{_libdir}/libpspell.a