* aspell: new upstream version

* hunspell: new upstream version


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5850 ec354946-7b23-47d6-9f5a-488ba84defc7

a/aspell/aspell-vl.spec

@@ -1,31 +1,34 @@
 %define _noVersionedDependencies        1
 
-%define ver 0.60.6
-%define rel 2
-
-Summary: A spelling checker.
-Summary(ja): スペルチェッカ
-Name: aspell
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
-License: LGPL
-Group: Applications/Text
-URL: http://aspell.net/
-Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz
-Source10: %{name}-install.sh
-Source11: %{name}-remove.sh
-Source12: %{name}-init.el
-Source100: aspell.conf
-Patch1003: aspell-0.60.3-install_info.patch
-Patch1005: aspell-0.60.5-fileconflict.patch
-Patch1007: aspell-0.60.5-pspell_conf.patch
-Patch1008: aspell-0.60.6-zero.patch
-
-Buildrequires: gcc-c++
-Requires(post,preun): %{_syssbindir}/install-info
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Provides: pspell
-Obsoletes: ispell, pspell
+%define ver 0.60.6.1
+%define rel 1
+
+Summary:         A spelling checker.
+Summary(ja):     スペルチェッカ
+Name:            aspell
+Version:         %{ver}
+Release:         %{rel}%{?_dist_release}
+License:         LGPL
+Group:           Applications/Text
+URL:             http://aspell.net/
+Source0:         ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz
+Source10:        %{name}-install.sh
+Source11:        %{name}-remove.sh
+Source12:        %{name}-init.el
+Source100:       aspell.conf
+Patch1003:       aspell-0.60.3-install_info.patch
+Patch1005:       aspell-0.60.5-fileconflict.patch
+Patch1007:       aspell-0.60.5-pspell_conf.patch
+Patch1008:       aspell-0.60.6-zero.patch
+Patch1009:       aspell-0.60.6-mp.patch
+
+BuildRequires:   gcc-c++ gettext ncurses-devel pkgconfig
+BuildRequires:   chrpath
+Requires(post):  %{_syssbindir}/install-info
+Requires(preun): %{_syssbindir}/install-info
+BuildRoot:       %{_tmppath}/%{name}-%{version}-root
+Provides:        pspell
+Obsoletes:       ispell, pspell
 
 
 %description
@@ -62,38 +65,55 @@ elisp for using aspell within emacsen.
 
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q
 %patch1003 -p1 -b .iinfo
 %patch1005 -p1 -b .fc
 %patch1007 -p1 -b .mlib
 %patch1008 -p1 -b .zero
+%patch1009 -p1 -b .ai
 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
+%configure --disable-rpath
 make %{?_smp_mflags}
+cp scripts/aspell-import examples/aspell-import
+chmod 644 examples/aspell-import
+cp manual/aspell-import.1 examples/aspell-import.1
+
 
 %install
+rm -rf %{buildroot}
 %makeinstall
 
-mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-*/ispell ${RPM_BUILD_ROOT}%{_bindir}
-mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-*/spell ${RPM_BUILD_ROOT}%{_bindir}
+mv %{buildroot}%{_libdir}/aspell-*/ispell %{buildroot}%{_bindir}
+mv %{buildroot}%{_libdir}/aspell-*/spell %{buildroot}%{_bindir}
+
+chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//nroff-filter.so
+chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//sgml-filter.so
+chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//context-filter.so
+chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//email-filter.so
+chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//tex-filter.so
+chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//texinfo-filter.so
+chrpath --delete %{buildroot}%{_bindir}/aspell
+chrpath --delete %{buildroot}%{_libdir}/libpspell.so.*
+
+rm -f %{buildroot}%{_libdir}/libaspell.la
+rm -f %{buildroot}%{_libdir}/libpspell.la
+rm -f %{buildroot}%{_libdir}/aspell-0.60/*-filter.la
+rm -f %{buildroot}%{_bindir}/aspell-import
+rm -f %{buildroot}%{_mandir}/man1/aspell-import.1*
 
-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
 
 # Add by H.Irokawa(2004.02.23)
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 644 %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/aspell.conf
+mkdir -p %{buildroot}%{_sysconfdir}
+install -m 644 %{SOURCE100} %{buildroot}%{_sysconfdir}/aspell.conf
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/aspell
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/emacsen-common/packages/install
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/emacsen-common/packages/remove
+mkdir -p %{buildroot}%{_prefix}/lib/emacsen-common/packages/install
+mkdir -p %{buildroot}%{_prefix}/lib/emacsen-common/packages/remove
 
-install -m 644 %{SOURCE12} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/%{name}
+install -m 644 %{SOURCE12} %{buildroot}/usr/share/emacs/site-lisp/%{name}
 
 # install  script( bytecompile el and install elc , remove )
 
@@ -155,25 +175,36 @@ fi
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/aspell.conf
-%doc README TODO
-%{_bindir}/*
+%doc README TODO COPYING examples/aspell-import examples/aspell-import.1
+%dir %{_libdir}/aspell-0.60
+%{_bindir}/a*
+%{_bindir}/ispell
+%{_bindir}/pr*
+%{_bindir}/run-with-aspell
+%{_bindir}/spell
+%{_bindir}/word-list-compress
 %{_libdir}/lib*.so.*
-%{_libdir}/aspell-*
-%{_infodir}/aspell.info*
-%{_mandir}/man1/*
+%{_libdir}/aspell-0.60/*
+%{_infodir}/aspell.*
+%{_mandir}/man1/aspell.1.*
+%{_mandir}/man1/run-with-aspell.1*
+%{_mandir}/man1/word-list-compress.1*
+%{_mandir}/man1/prezip-bin.1.*
 
 %files		devel
 %defattr(-,root,root)
+%{_bindir}/pspell-config
 %{_includedir}/aspell.h
 %{_includedir}/pspell
 %{_infodir}/aspell-dev.info*
 %{_libdir}/lib*spell.so
 %{_libdir}/pkgconfig/aspell.pc
+%{_mandir}/man1/pspell-config.1*
 
 %files          el
 %{_datadir}/emacs/site-lisp/%{name}/
@@ -181,6 +212,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/emacsen-common/packages/remove/%{name}
 
 %changelog
+* Tue Mar 06 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.60.6.1-1
+- updated to 0.60.6.1
+- import Patch1009 from Fedora
+
 * Tue May  3 2011 IWAI, Masaharu <iwai@alib.jp> 0.60.6-2
 - update aspell.conf (Source100)
 

h/hunspell/hunspell-vl.spec

@@ -1,7 +1,7 @@
 Name:      hunspell
-Summary:   Hunspell is a spell checker and morphological analyzer library
-Version:   1.2.8
-Release:   2%{?_dist_release}
+Summary:   A spell checker and morphological analyzer library
+Version:   1.3.2
+Release:   1%{?_dist_release}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Source2:   http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
@@ -11,6 +11,7 @@ URL:       http://hunspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License:   LGPLv2+ or GPLv2+ or MPLv1.1
 BuildRequires: libtool, ncurses-devel
+Patch0:    hunspell.rhbz759647.patch
 
 #define __find_requires %{SOURCE100}
 %define __perl_requires %{SOURCE100}
@@ -31,6 +32,7 @@ Includes and definitions for developing with hunspell
 
 %prep
 %setup -q
+%patch0 -p0 -b .rhbz759647
 
 %build
 libtoolize --automake --force
@@ -45,26 +47,29 @@ done
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 %find_lang %{name}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_bindir}/example
-mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell
-mv $RPM_BUILD_ROOT/%{_includedir}/*munch* $RPM_BUILD_ROOT/%{_includedir}/%{name}
-install -m 755 src/tools/affixcompress $RPM_BUILD_ROOT/%{_bindir}/affixcompress
-install -m 755 src/tools/makealias $RPM_BUILD_ROOT/%{_bindir}/makealias
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/wordlist2hunspell
+rm -f %{buildroot}/%{_libdir}/*.a
+rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_bindir}/example
+mkdir %{buildroot}/%{_datadir}/myspell
+#mv %{buildroot}/%{_includedir}/*munch* %{buildroot}/%{_includedir}/%{name}
+install -m 755 src/tools/affixcompress %{buildroot}/%{_bindir}/affixcompress
+install -m 755 src/tools/makealias %{buildroot}/%{_bindir}/makealias
+install -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/ispellaff2myspell
+install -m 755 %{SOURCE2} %{buildroot}/%{_bindir}/wordlist2hunspell
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%check
+make check
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README README.myspell COPYING COPYING.LGPL COPYING.MPL AUTHORS AUTHORS.myspell license.hunspell license.myspell THANKS
@@ -90,12 +95,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hunzip
 %{_bindir}/ispellaff2myspell
 %{_bindir}/wordlist2hunspell
+%{_bindir}/wordforms
 %{_libdir}/pkgconfig/hunspell.pc
 %{_mandir}/man1/hunzip.1.gz
 %{_mandir}/man1/hzip.1.gz
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Tue Mar 06 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.3.2-1
+- updated to 1.3.2
+- import Patch0 from Fedora (rhbz#759647 temp file name collision)
+
 * Mon Oct 11 2010 Shu KONNO <owa@bg.wakwak.com> 1.2.8-2
 - rebuilt with rpm-4.8.1 for pkg-config
 - s/__find_requires/__perl_requires/