diff --git a/.cvsignore b/.cvsignore index c02e2eb..69266d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aspell-.33.7.1.tar.gz +aspell-0.50.3.tar.gz diff --git a/aspell-0.50.3-gcc33.patch b/aspell-0.50.3-gcc33.patch new file mode 100644 index 0000000..78b0973 --- /dev/null +++ b/aspell-0.50.3-gcc33.patch @@ -0,0 +1,10 @@ +--- aspell-0.50.3/prog/checker_string.cpp.gcc33 2003-05-22 22:52:59.000000000 -0400 ++++ aspell-0.50.3/prog/checker_string.cpp 2003-05-22 22:53:13.000000000 -0400 +@@ -4,6 +4,7 @@ + // license along with this library if you did not you can find + // it at http://www.gnu.org/. + ++#include + #include "checker_string.hpp" + #include "speller.hpp" + #include "document_checker.hpp" diff --git a/aspell-0.50.3.prefix.patch b/aspell-0.50.3.prefix.patch new file mode 100644 index 0000000..a08142c --- /dev/null +++ b/aspell-0.50.3.prefix.patch @@ -0,0 +1,15 @@ +--- aspell-0.50.3/common/Makefile.in.prefix 2003-04-28 14:47:40.000000000 -0400 ++++ aspell-0.50.3/common/Makefile.in 2003-04-28 14:50:50.000000000 -0400 +@@ -516,10 +516,10 @@ + + + dirs.h: mk-dirs_h +- echo '#define PREFIX "${prefix}"' > dirs.h ++ echo '#define PREFIX "/usr"' > dirs.h + ./mk-dirs_h ${prefix} DICT_DIR ${pkglibdir} >> dirs.h + ./mk-dirs_h ${prefix} DATA_DIR ${pkgdatadir} >> dirs.h +- ./mk-dirs_h ${prefix} CONF_DIR ${sysconfdir} >> dirs.h ++ echo '#define CONF_DIR "/etc"' >> dirs.h + + config.cpp: dirs.h + diff --git a/aspell.spec b/aspell.spec index 2150b95..67bc4db 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,122 +1,128 @@ Summary: A spelling checker. Name: aspell -Version: 0.33.7.1 -Epoch: 2 -Release: 21 +Version: 0.50.3 +Release: 16 +Epoch: 12 License: LGPL Group: Applications/Text -URL: http://aspell.sourceforge.net/ -Source0: http://download.sourceforge.net/aspell/%{name}-.33.7.1.tar.gz -Source1: aspell-init.el -Patch0: aspell-.33-fix2.diff -Patch1: aspell-.33.7.1-workaround.patch -Requires: pspell = 3:0.12.2 -Buildrequires: pspell-devel = 3:0.12.2, gcc-c++ +URL: http://aspell.net/ +Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz +Patch0: aspell-0.50.3.prefix.patch +Patch1: aspell-0.50.3-gcc33.patch +Buildrequires: gcc-c++ +Requires: aspell-en BuildRoot: %{_tmppath}/%{name}-%{version}-root -Obsoletes: ispell +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 %description -Aspell is a spelling checker designed to eventually replace Ispell. -Aspell's primary advantage (over Ispell) is a greater skill at -suggesting correct spellings. Aspell includes both compile-time and -run-time support for non-English languages and can spellcheck (La)TeX -and HTML files. +GNU Aspell is a spell checker designed to eventually replace Ispell. It can +either be used as a library or as an independent spell checker. Its main +feature is that it does a much better job of coming up with possible +suggestions than just about any other spell checker out there for the +English language, including Ispell and Microsoft Word. It also has many +other technical enhancements over Ispell such as using shared memory for +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. Group: Development/Libraries -Requires: pspell-devel aspell = %{version} +Requires: aspell = %{epoch}:%{version} +Provides: pspell-devel +Obsoletes: pspell-devel %description devel Aspell is a spelling checker. The aspell-devel package includes the -static libraries and header files needed for Aspell development. Note -that the recommended way to use aspell is through the Pspell library. - -%package en-gb -Summary: A British English dictionary for aspell. -Group: Applications/Text -Requires: aspell - -%description en-gb -This package contains a British English dictionary for use with -aspell, a spelling checker. - -%package en-ca -Summary: A Canadian English dictionary for aspell. -Group: Applications/Text -Requires: aspell - -%description en-ca -This package contains a Canadian English dictionary for use with -aspell, a spelling checker. +static libraries and header files needed for Aspell development. %prep rm -rf $RPM_BUILD_ROOT - -%setup -q -n aspell-.33.7.1 - -%patch0 -p0 -b .fix2 -#patch1 -p1 -b .evilworkaround +%setup -q -n aspell-%{version} +%patch -p1 -b .prefix +%patch1 -p1 -b .gcc33 %build %configure -make %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall -mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d -mkdir -p $RPM_BUILD_ROOT/usr/lib/xemacs/xemacs-packages/lisp/site-start.d -mkdir -p $RPM_BUILD_ROOT/usr/bin +mv ${RPM_BUILD_ROOT}%{_datadir}/aspell/ispell ${RPM_BUILD_ROOT}%{_bindir} +mv ${RPM_BUILD_ROOT}%{_datadir}/aspell/spell ${RPM_BUILD_ROOT}%{_bindir} -install -m 755 scripts/spell $RPM_BUILD_ROOT/usr/bin/spell -install -m 755 scripts/ispell $RPM_BUILD_ROOT/usr/bin/ispell -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/xemacs/xemacs-packages/lisp/site-start.d +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la -cp -pr $RPM_BUILD_ROOT/usr/doc/aspell . -rm -f aspell/manual.aux - -# remove the doc stuff we don't want packaged -rm -rf $RPM_BUILD_ROOT/%{_prefix}/doc +rm -f $RPM_BUILD_ROOT/usr/share/doc/aspell/manual.aux %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc README TODO aspell/* +%doc README TODO +%doc %{_docdir}/aspell/* + %{_bindir}/* -%{_libdir}/aspell/american* -%{_libdir}/aspell/english* %{_libdir}/lib*.so.* -# Yes, they need to be in the main package - they are used for -# dynamic loading. Argh. -%{_libdir}/lib*.la /usr/share/aspell -/usr/share/pspell -/usr/share/emacs/site-lisp/site-start.d/* -/usr/lib/xemacs/xemacs-packages/lisp/site-start.d/* %files devel %defattr(-,root,root) -/usr/include/aspell -%{_libdir}/lib*aspell.a -%{_libdir}/lib*aspell.so +/usr/include/aspell.h +/usr/include/pspell/pspell.h +%{_libdir}/lib*spell.so -%files en-ca -%defattr(-,root,root) -%{_libdir}/aspell/canadian* +%changelog +* Tue Oct 07 2003 Adrian Havill 12:0.50.3-16 +- moved spell compat script from /usr/share/aspell to /usr/bin (#105921) -%files en-gb -%defattr(-,root,root) -%{_libdir}/aspell/british* +* Tue Jul 01 2003 Adrian Havill 11:0.50.3-15 +- moved ispell compat script from /usr/share/aspell to /usr/bin (#90907) + +* Tue Jun 24 2003 Adrian Havill 10:0.50.3-14 +- removed emacs/xemacs el files which are already provided + +* Mon Jun 18 2003 Adrian Havill 9:0.50.3-13 +- provide pspell-devel in addition to obsoleting it + +* Tue Jun 10 2003 Adrian Havill 8:0.50.3-12 +- obsolete old dicts designed for previous aspell + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri May 30 2003 Joe Orton 7:0.50.3-10 +- rebuild again to fix libpspell deps + +* Fri May 30 2003 Joe Orton 7:0.50.3-9 +- remove ExcludeArch + +* Thu May 22 2003 Jeremy Katz 7:0.50.3-8 +- fix build with gcc 3.3 + +* Wed May 22 2003 Adrian Havill 0.50.3-7 +- require aspell-en for upgrades + +* Sun May 11 2003 Jeremy Katz 6:0.50.3-6 +- -devel should obsolete pspell-devel + +* Tue May 6 2003 Joe Orton 0.50.3-5 +- include libpspell.so in devel package + +* Wed May 1 2003 Adrian Havill 0.50.3-4 +- removed .la files + +* Wed Apr 16 2003 Adrian Havill 0.50.3-3 +- Changed the header for provides, obsoletes, epoch +- fixed config prefix in dirs.h + +* Wed Apr 16 2003 Adrian Havill 0.50.3-1 +- upgrade to 0.50.3 -%changelog * Wed Jan 22 2003 Tim Powers - rebuilt diff --git a/sources b/sources index abdd5c2..709d037 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31fead688c78e7bd61f924501c5dd1e6 aspell-.33.7.1.tar.gz +a3bf0d46303ffb0beab8121bbc3311a3 aspell-0.50.3.tar.gz