diff --git a/aspell.spec b/aspell.spec index c81d62e..9fcff38 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,7 +1,7 @@ -Summary: A spelling checker +Summary: Spell checker Name: aspell Version: 0.60.6 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 12 License: LGPLv2 and MIT Group: Applications/Text @@ -16,11 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, ncurses-devel, pkgconfig Requires(pre): /sbin/install-info Requires(preun): /sbin/install-info -Provides: pspell < 0.13 -Obsoletes: pspell < 0.13 -Conflicts: ispell < 3.1.21, aspell-pt_BR < 2.5, aspell-config < 0.27 -Conflicts: aspell-de < 0.50, aspell-fr < 0.50, aspell-ca < 0.50, aspell-da < 0.50, aspell-es < 0.50, aspell-it < 0.50, aspell-nl < 0.50, aspell-no < 0.50, aspell-sv < 0.50 - %description GNU Aspell is a spell checker designed to eventually replace Ispell. It can @@ -37,7 +32,7 @@ Summary: Static libraries and header files for Aspell development Group: Development/Libraries Requires: aspell = %{epoch}:%{version}-%{release} Requires: pkgconfig -Requires(pre): /sbin/install-info +Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Provides: pspell-devel < 0.13 Obsoletes: pspell-devel < 0.13 @@ -59,6 +54,9 @@ mv manual/aspell.info.aux manual/aspell.info %build %configure make %{?_smp_mflags} +cp scripts/aspell-import examples/aspell-import +cp manual/aspell-import.1 examples/aspell-import.1 + %install rm -rf $RPM_BUILD_ROOT @@ -72,7 +70,8 @@ mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/spell ${RPM_BUILD_ROOT}%{_bindir} rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la -chmod 644 ${RPM_BUILD_ROOT}%{_bindir}/aspell-import +rm -f ${RPM_BUILD_ROOT}%{_bindir}/aspell-import +rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 %find_lang %{name} @@ -93,7 +92,6 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/aspell.info.gz %{_infodir}/dir || : fi fi -exit 0 %preun devel if [ $1 = 0 ]; then @@ -101,15 +99,15 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/aspell-dev.info.gz %{_infodir}/dir || : fi fi -exit 0 %postun -p /sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) -%doc README TODO COPYING +%doc README TODO COPYING examples/aspell-import examples/aspell-import.1 %dir %{_libdir}/aspell-0.60 %{_bindir}/a* %{_bindir}/ispell @@ -121,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/aspell-0.60/* %{_datadir}/locale/*/LC_MESSAGES/aspell.mo %{_infodir}/aspell.* -%{_mandir}/man1/aspell* +%{_mandir}/man1/aspell.1.* %{_mandir}/man1/run-with-aspell.1* %{_mandir}/man1/word-list-compress.1* %{_mandir}/man1/prezip-bin.1.* @@ -138,6 +136,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/pspell-config.1* %changelog +* Fri Nov 27 2009 Ivana Hutarova Varekova - 12:0.60.6-8 +- change summary name + remove outdated Obsoletes, Conflicts and Provides flag + fix requirement to install-info (pre -> post) + move aspell-import to documentation part + remove exit 0 from scriptlets + * Mon Aug 10 2009 Ivana Varekova - 12:0.60.6-7 - fix installation with --excludedocs option (#515911)