aspell-0.60.6-1

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

a/aspell/aspell-vl.spec

@@ -1,23 +1,29 @@
 %define _noVersionedDependencies        1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+
+%define ver 0.60.6
+%define rel 1
 
 Summary: A spelling checker.
 Summary(ja): スペルチェッカ
 Name: aspell
-Version: 0.50.5
-Release: 1%{?_dist_release}
+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
-Source2: ftp://ftp.gnu.org/gnu/aspell/aspell-en-0.51-0.tar.bz2
 Source10: %{name}-install.sh
 Source11: %{name}-remove.sh
 Source12: %{name}-init.el
 Source100: aspell.conf
-Patch0: aspell-0.50.5.prefix.patch
-Patch1: aspell-compress-bug.patch
+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
@@ -49,7 +55,7 @@ static libraries and header files needed for Aspell development.
 Summary: Emacs lisp for aspell
 Group: Applications/Editors/Emacs
 Requires: aspell = %{version}-%{release}
-PreReq: emacsen-common
+Requires: emacsen-common
 
 %description    el
 Aspell is a spelling checker. The aspell-el package includes the
@@ -58,32 +64,27 @@ elisp for using aspell within emacsen.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q -n aspell-%{version} -a 2
-%patch0 -p1 -b .prefix
-%patch1 -p0 -b .compress
+%setup -q
+%patch1003 -p1 -b .iinfo
+%patch1005 -p1 -b .fc
+%patch1007 -p1 -b .mlib
+%patch1008 -p1 -b .zero
+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
-
-pushd aspell-en-0.51-0
-echo "ASPELL = ../prog/aspell --data-dir=../data" > Makefile
-echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile
-echo "WORD_LIST_COMPRESS = ../prog/word-list-compress" >> Makefile
-echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile
-echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile
-cat Makefile.pre >> Makefile
-make
-popd
+make %{?_smp_mflags}
 
 %install
 %makeinstall
 
-mv ${RPM_BUILD_ROOT}%{_datadir}/aspell/ispell ${RPM_BUILD_ROOT}%{_bindir}
-mv ${RPM_BUILD_ROOT}%{_datadir}/aspell/spell ${RPM_BUILD_ROOT}%{_bindir}
+mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-*/ispell ${RPM_BUILD_ROOT}%{_bindir}
+mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-*/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
 
 # Add by H.Irokawa(2004.02.23)
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -103,13 +104,21 @@ install -m 644 %{SOURCE12} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/%{name}
 
 rm -f $RPM_BUILD_ROOT/usr/share/doc/aspell/manual.aux
 
-pushd aspell-en-0.51-0
-make install
-popd
-
+%find_lang %{name}
    
 %post
 /sbin/ldconfig
+# info
+if [ "$1" = 0 ] ; then
+%{_syssbindir}/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir
+fi
+
+%post devel
+/sbin/ldconfig
+# info
+if [ "$1" = 0 ] ; then
+%{_syssbindir}/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir
+fi
 
 %post el
 if [ "$1" = 2 ]; then
@@ -126,6 +135,16 @@ fi
 %postun
 /sbin/ldconfig
 
+%preun
+if [ $1 = 0 ]; then
+%{_syssbindir}/install-info --delete %{_infodir}/aspell.info.gz %{_infodir}/dir
+fi
+
+%preun devel
+if [ $1 = 0 ]; then
+%{_syssbindir}/install-info --delete %{_infodir}/aspell-dev.info.gz %{_infodir}/dir
+fi
+
 %preun el
 if [ "$1" = 0 ]; then
 
@@ -139,22 +158,23 @@ fi
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
-%config %{_sysconfdir}/aspell.conf
+%config(noreplace) %{_sysconfdir}/aspell.conf
 %doc README TODO
-%doc %{_docdir}/aspell/*
-
 %{_bindir}/*
 %{_libdir}/lib*.so.*
-%{_libdir}/aspell/*
-%{_datadir}/aspell/*
+%{_libdir}/aspell-*
+%{_infodir}/aspell.info*
+%{_mandir}/man1/*
 
 %files		devel
 %defattr(-,root,root)
-/usr/include/aspell.h
-/usr/include/pspell/pspell.h
+%{_includedir}/aspell.h
+%{_includedir}/pspell
+%{_infodir}/aspell-dev.info*
 %{_libdir}/lib*spell.so
+%{_libdir}/pkgconfig/aspell.pc
 
 %files          el
 %{_datadir}/emacs/site-lisp/%{name}/
@@ -162,6 +182,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/emacsen-common/packages/remove/%{name}
 
 %changelog
+* Sat Apr 16 2011 IWAI, Masaharu <iwai@alib.jp> 0.60.6-1
+- new upstream release
+- sync Fedora 0.60.6-14
+ - split English dictionary package: create aspell-en package
+ - drop unnecessary patches
+  - prefix patch (Patch0)
+  - fix compress patch (Patch1)
+ - add some patches (Patch1003, 1005, 1007, 1008)
+ - create aspell.pc file
+ - update files
+ - add post, preun scripts for info file
+ - add Requires(post,preun) for installing info file
+- noreplace aspell.conf
+
 * Fri Aug 15 2008 Shu KONNO <owa@bg.wakwak.com> 0.50.5-1vl5
 - applied new versioning policy, spec in utf-8
 
@@ -257,106 +291,106 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jun 21 2002 Tim Powers <timp@redhat.com> 0.33.7.1-13
 - automated rebuild
 
-* Thu Jun 13 2002 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-12
+* Thu Jun 13 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-12
 - Rebuild to make it work again... #66708
 
 * Thu May 23 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 
-* Mon May 13 2002 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-10
+* Mon May 13 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-10
 - Rebuild
 
-* Thu Feb 21 2002 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-9
+* Thu Feb 21 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-9
 - Disable evil patch
 
-* Mon Jan 28 2002 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-8
+* Mon Jan 28 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-8
 - Build on more archs (doh)
 
-* Tue Jan 22 2002 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-7
+* Tue Jan 22 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-7
 - Make it compile with new compiler (evil workaround)
 
-* Wed Jan 16 2002 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-5
+* Wed Jan 16 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-5
 - Rebuild
 - Unexclude alpha
 
-* Fri Dec 14 2001 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-3
+* Fri Dec 14 2001 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-3
 - Rebuild
 - Don't build on alpha
 
 * Mon Oct 29 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.33.7.1-2
 - "make it work with gcc 3.1" ;)
 
-* Tue Sep 18 2001 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7.1-1
+* Tue Sep 18 2001 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7.1-1
 - 0.33.7.1, which is a "make it work with gcc 3" release
 
 * Wed Sep 12 2001 Tim Powers <timp@redhat.com>
 - rebuild with new gcc and binutils
 
-* Thu Aug  9 2001 Trond Eivind Glomsr藷?<teg@redhat.com> 0.33.7-1
+* Thu Aug  9 2001 Trond Eivind Glomsrød <teg@redhat.com> 0.33.7-1
 - 0.33.7 bugfix release. Requested by the author, it fixes
   coredumps in sug-mode and when not using typo-analyses.
   It also contains code cleanups so it compiles with -ansi
 - should fix coredump on IA64 (#49746)
 
-* Wed Jul 11 2001 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Wed Jul 11 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Add the .la files in the main package - used for dynamic loading
 
-* Sun Jun  3 2001 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Sun Jun  3 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - 0.33.6.3, which includes the fix made yesterday
 
-* Sat Jun  2 2001 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Sat Jun  2 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Make it search for directories in the correct location
 
-* Wed May 30 2001 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Wed May 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - No more workarounds at the specfile level
 
-* Tue May 29 2001 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Tue May 29 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Use custom ltmain.sh to work around buggy bundled libtool
 
-* Sun May 20 2001 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Sun May 20 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - 0.33.6
 - use standard %%configure macro - it works now.
 
 * Fri May 11 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.33.5-2
 - Rebuild with new libltdl
 
-* Mon Apr 23 2001 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Mon Apr 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - 0.33.5
 
-* Thu Nov 30 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Thu Nov 30 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - use new emacs init scheme for Emacs and XEmacs
 
-* Wed Nov 22 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Wed Nov 22 2000 Trond Eivind Glomsrød <teg@redhat.com>
 -  .32.6
 
-* Sat Aug 19 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Sat Aug 19 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - .32.5 bugfix release (also contains improved documentation),
   obsolete old patch
 - the compatibility scripts are now part of the package itself
 - clean up build procedure
 - remove manual.aux file from docs (#16424)
 
-* Sun Aug 06 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Sun Aug 06 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - .32.1 bugfix release, obsolete old patch
 - rename to 0.32.1
 - add patch from author to change his email address
 - add spell and ispell compatibility scripts
 
-* Fri Aug 04 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Fri Aug 04 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - rebuild
 
-* Tue Aug 01 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Tue Aug 01 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - remember to obsolete ispell
 - build the Canadian and British dictionaries here now,
   as part of the main package. Same package names and 
   descriptions.
 
-* Mon Jul 24 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Mon Jul 24 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - .32
 - remove old patches, add a patch since namespace isn't 
   polluted as much anymore (as opposed to older toolchain)
 
-* Wed Jul 19 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Wed Jul 19 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - rebuild
 
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
@@ -365,24 +399,24 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul  4 2000 Jakub Jelinek <jakub@redhat.com>
 - Rebuild with new C++
 
-* Fri Jun 30 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Fri Jun 30 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - use RPM_OPT_FLAGS, not just -O0
 - dont include .la-files
 
-* Fri Jun 23 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Fri Jun 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - excludearch ia64
 
-* Fri Jun 23 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Fri Jun 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - patch to work around compiler bug(?) wrt. inline functions
 - use CFLAGS and CXXFLAGS
 - set them to -O0 to work around YACB
 - copy libtool files for IA64 support
 
-* Sun Jun 18 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Sun Jun 18 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - update to .31.1. My patch was upstreamed and is no longer needed.
 - new patch added so DESTDIR works properly
 
-* Fri Jun 16 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Fri Jun 16 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - (this entry includes some old ones...)
 - update to .31
 - added patch to make it compile with a pickier compiler