From 7c0b4acba4466e36ed9a39057b60b0fc8d09ec7f Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Feb 08 2007 13:54:40 +0000 Subject: - incorporate package review feedback --- diff --git a/aspell.spec b/aspell.spec index dfbdfa0..0be6211 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,7 +1,7 @@ Summary: A spelling checker Name: aspell Version: 0.60.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 12 License: LGPL Group: Applications/Text @@ -12,11 +12,15 @@ Patch3: aspell-0.60.3-install_info.patch Patch5: aspell-0.60.5-fileconflict.patch Patch7: aspell-0.60.5-pspell_conf.patch Requires: aspell-en -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, ncurses-devel, pkgconfig -Prereq: /sbin/install-info -Provides: pspell -Obsoletes: ispell, pspell, 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, aspell-pt_BR, aspell-config +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 @@ -29,11 +33,14 @@ dictionaries and intelligently handling personal dictionaries when more than one Aspell process is open at once. %package devel -Summary: Static libraries and header files for Aspell development. +Summary: Static libraries and header files for Aspell development Group: Development/Libraries Requires: aspell = %{epoch}:%{version}-%{release} -Provides: pspell-devel -Obsoletes: pspell-devel +Requires: pkgconfig +Requires(pre): /sbin/install-info +Requires(preun): /sbin/install-info +Provides: pspell-devel < 0.13 +Obsoletes: pspell-devel < 0.13 %description devel Aspell is a spelling checker. The aspell-devel package includes the @@ -45,12 +52,15 @@ static libraries and header files needed for Aspell development. %patch3 -p1 -b .iinfo %patch5 -p1 -b .fc %patch7 -p1 -b .mlib +iconv -f windows-1252 -t utf-8 manual/aspell.info -o manual/aspell.info.aux +mv manual/aspell.info.aux manual/aspell.info %build %configure -make +make %{?_smp_mflags} %install +rm -rf $RPM_BUILD_ROOT %makeinstall mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60 @@ -61,6 +71,9 @@ 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 + +%find_lang %{name} %post /sbin/ldconfig @@ -85,10 +98,9 @@ exit 0 %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root) %doc README TODO COPYING -#%dir %{_datadir}/doc/aspell-%{version} %dir %{_libdir}/aspell-0.60 %{_bindir}/a* %{_bindir}/ispell @@ -117,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/pspell-config.1* %changelog +* Thu Feb 8 2007 Ivana Varekova - 12:0.60.5-3 +- incorporate package review feedback + * Mon Jan 22 2007 Ivana Varekova - 12:0.60.5-2 - Resolves: 223676 fix non-failsafe install-info problem @@ -177,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT - add obsolete aspell-config * Mon Aug 23 2004 Adrian Havill 12:0.50.5-2.fc3 -- fix doc dir (#128140) (don't flag aspell doc stuff with the %doc +- fix doc dir (#128140) (don't flag aspell doc stuff with the doc macro flag due to rpm badness) * Mon Jun 21 2004 Warren Togami 12:0.50.5-1 @@ -407,7 +422,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Jul 8 1999 Tim Powers - built for Powertools 6.1 -- removed %serial definitions from spec file to make versioning +- removed serial macro definitions from spec file to make versioning consistant with the other packages we ship. - changed build root path - general spec file cleanups