diff --git a/.cvsignore b/.cvsignore index 384a38a..d6fb9d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aspell5-en-6.0-0.tar.bz2 +aspell6-en-6.0-0.tar.bz2 diff --git a/aspell-en.spec b/aspell-en.spec index 563059a..3f91509 100644 --- a/aspell-en.spec +++ b/aspell-en.spec @@ -1,16 +1,15 @@ %define lang en %define langrelease 0 -Summary: English dictionaries for Aspell. +%define aspellversion 6 +Summary: English dictionaries for Aspell Name: aspell-%{lang} Epoch: 50 Version: 6.0 -Release: 2.1 +Release: 3%{?dist} License: distributable Group: Applications/Text URL: http://aspell.net/ -Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell5-%{lang}-%{version}-%{langrelease}.tar.bz2 -Patch0: aspell-en-6.0-offencive.patch -Patch1: aspell-en-6.0-practise.patch +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}.tar.bz2 Buildrequires: aspell >= 12:0.60 Requires: aspell >= 12:0.60 Obsoletes: aspell-en-gb, aspell-en-ca, @@ -23,22 +22,15 @@ Provides the word list/dictionaries for the following: English, Canadian English, British English %prep -rm -rf $RPM_BUILD_ROOT -%setup -q -n aspell5-%{lang}-%{version}-%{langrelease} -%patch0 -p0 -b .off -%patch1 -p0 -b .prac +%setup -q -n aspell%{aspellversion}-%{lang}-%{version}-%{langrelease} %build -echo "ASPELL = aspell" > Makefile -echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile -echo "PREZIP = word-list-compress" >> Makefile -echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60" >> Makefile -echo "datadir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60" >> Makefile -cat Makefile.pre >> Makefile +./configure make %install -make install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -47,9 +39,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_libdir}/aspell-0.60/* -#%{_datadir}/aspell/* %changelog +* Thu Mar 29 2007 Ivana Varekova - 50:6.0-3 +- update to aspell6 +- use configure script to create Makefile +- update default buildroot +- some minor spec changes + * Wed Jul 12 2006 Jesse Keating - 50:6.0-2.1 - rebuild diff --git a/sources b/sources index 96b4e36..c1bc058 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf3ed669bc15a4a9360c0498eca27507 aspell5-en-6.0-0.tar.bz2 +16449e0a266e1ecc526b2f3cd39d4bc2 aspell6-en-6.0-0.tar.bz2