Hello community, here is the log from the commit of package ispell for openSUSE:Factory checked in at Mon Jun 8 11:52:49 CEST 2009. -------- --- ispell/ispell.changes 2007-05-31 19:28:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/ispell/ispell.changes 2009-06-07 12:04:51.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jun 7 12:04:12 CEST 2009 - ro@suse.de + +- rename getline to my_getline to avoid conflict with function + from glibc + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ispell-3.3.02-getline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ispell.spec ++++++ --- /var/tmp/diff_new_pack.z17490/_old 2009-06-08 11:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.z17490/_new 2009-06-08 11:52:42.000000000 +0200 @@ -1,26 +1,34 @@ # # spec file for package ispell (Version 3.3.02) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: ispell BuildRequires: bison ncurses-devel words -URL: http://www.lasr.cs.ucla.edu/geoff/ispell.html -License: BSD License and BSD-like +Url: http://www.lasr.cs.ucla.edu/geoff/ispell.html +License: BSD 3-Clause Group: Productivity/Text/Spell PreReq: fillup fileutils Provides: spell Requires: words ispell_english_dictionary ispell_dictionary -Autoreqprov: on +AutoReqProv: on Version: 3.3.02 -Release: 1 +Release: 85 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Spell Checker Source: ispell-3.3.02.tar.bz2 @@ -36,6 +44,7 @@ Patch7: ispell-3.3.02-brkgcc.patch Patch8: ispell-3.3.02-mkdir.patch Patch9: ispell-3.3.02-strip.patch +Patch10: ispell-3.3.02-getline.patch %description Ispell is a fast, screen-oriented spell checker that shows you your @@ -59,11 +68,12 @@ Goeff Kuenning <geoff@ITcorp.com> %package -n ispell-american +License: BSD 3-Clause Summary: American ispell dictionary Group: Productivity/Text/Spell Provides: ispell_english_dictionary ispell_dictionary iamerica locale(ispell:en) Obsoletes: iamerica -Autoreqprov: on +AutoReqProv: on %description -n ispell-american This package includes a ready American dictionary for ispell. If you @@ -75,11 +85,12 @@ %package -n ispell-british +License: BSD 3-Clause Summary: British ispell dictionary Group: Productivity/Text/Spell Provides: ispell_english_dictionary ispell_dictionary ibritish locale(ispell:en_GB) Obsoletes: ibritish -Autoreqprov: on +AutoReqProv: on %description -n ispell-british This packages includes a ready British dictionary for ispell. If you @@ -102,6 +113,7 @@ %patch -P 7 -p 0 -b .brkgcc %patch -P 8 -p 0 -b .mkdir %patch -P 9 -p 0 -b .strip +%patch10 %build PATH=$PATH:$PWD @@ -196,107 +208,110 @@ /usr/lib/ispell/british.aff %changelog -* Thu May 31 2007 - werner@suse.de +* Sun Jun 07 2009 ro@suse.de +- rename getline to my_getline to avoid conflict with function + from glibc +* Thu May 31 2007 werner@suse.de - Update ispell to version 3.3.02 including various bug fixes and add new old html parser and support for UTF-8. -* Thu May 31 2007 - werner@suse.de +* Thu May 31 2007 werner@suse.de - Fix sq/unsq, hint from Thomas Rachel -* Thu Mar 29 2007 - rguenther@suse.de +* Thu Mar 29 2007 rguenther@suse.de - Add bison and ncurses-devel BuildRequires. -* Mon May 22 2006 - schwab@suse.de +* Mon May 22 2006 schwab@suse.de - Don't strip binaries. -* Wed Mar 29 2006 - werner@suse.de +* Wed Mar 29 2006 werner@suse.de - Add locale provides (bug #161478) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Jan 12 2006 - werner@suse.de +* Thu Jan 12 2006 werner@suse.de - Fix dangling symlink (bug #142828) -* Fri Jul 01 2005 - werner@suse.de +* Fri Jul 01 2005 werner@suse.de - Make it build-root and no norootforbuild -* Thu Jun 02 2005 - mfabian@suse.de +* Thu Jun 02 2005 mfabian@suse.de - fix ispell-emacs-menu.el for XEmacs 21.5.20 and xemacs-packages-20050505 (coding system iso-8859-14 may not exist without requiring 'latin-euro-latin8). -* Thu Mar 10 2005 - werner@suse.de +* Thu Mar 10 2005 werner@suse.de - Use /var/lib/dict/ to handle ro /usr/share/dict/ and the symbolic link `english.hash/aff' to the choosen dictionary (bug #67048) -* Tue Dec 21 2004 - werner@suse.de +* Tue Dec 21 2004 werner@suse.de - Be sure that the string utils uses the POSIX locale -* Mon May 03 2004 - werner@suse.de +* Mon May 03 2004 werner@suse.de - Add break condition for checking HUGE lines to avoid side effect of the new ``compensate for short copy strategy'' (bug #39745) -* Thu Jan 08 2004 - ro@suse.de +* Thu Jan 08 2004 ro@suse.de - fix build with current bison -* Fri Aug 29 2003 - werner@suse.de +* Fri Aug 29 2003 werner@suse.de - More about new POSIX sort behaviour: one fix in munchlist and four fixes in findaffix (bug #29627). -* Thu Aug 28 2003 - mmj@suse.de +* Thu Aug 28 2003 mmj@suse.de - Add sysconfig metadata [#28885] -* Thu Jul 24 2003 - werner@suse.de +* Thu Jul 24 2003 werner@suse.de - Fix encode mappings for Xemacs -* Tue Apr 08 2003 - werner@suse.de +* Tue Apr 08 2003 werner@suse.de - Fix munchlist sort using - Fix Makefile's sort using - Use secure tmp directory for munchlist -* Tue Apr 08 2003 - werner@suse.de +* Tue Apr 08 2003 werner@suse.de - Use -n option for tail - Use iso-latin-1 even for english dictionaries to avoid splits - Add some more comments about new german and the DICTIONARY var -* Thu Feb 20 2003 - mmj@suse.de +* Thu Feb 20 2003 mmj@suse.de - Add sysconfig metadata [#22650] -* Wed Sep 18 2002 - ro@suse.de +* Wed Sep 18 2002 ro@suse.de - removed bogus self-provides -* Thu Aug 15 2002 - ro@suse.de +* Thu Aug 15 2002 ro@suse.de - fixed typo in specfile -* Thu Aug 15 2002 - werner@suse.de +* Thu Aug 15 2002 werner@suse.de - Add pre-requires (bug #17885) -* Mon May 13 2002 - egmont@suselinux.hu +* Mon May 13 2002 egmont@suselinux.hu - use RC_LANG instead of obsolete DEFAULT_LANGUAGE -* Tue Apr 16 2002 - adrian@suse.de +* Tue Apr 16 2002 adrian@suse.de - add Provides spell (kdelibs3 needs either ispell or aspell now) -* Thu Mar 07 2002 - egmont@suselinux.hu +* Thu Mar 07 2002 egmont@suselinux.hu - Fixed template comment -* Wed Feb 20 2002 - werner@suse.de +* Wed Feb 20 2002 werner@suse.de - Avoid circular depndencies (bug #13609) -* Mon Feb 04 2002 - egmont@suselinux.hu +* Mon Feb 04 2002 egmont@suselinux.hu - SuSE GmbH -> SuSE Linux AG -* Thu Jan 24 2002 - werner@suse.de +* Thu Jan 24 2002 werner@suse.de - Make MASKTYPE to a string (thanks to Jan Cihlar) -* Wed Jan 16 2002 - egmont@suselinux.hu +* Wed Jan 16 2002 egmont@suselinux.hu - Rename packages to ispell-american and ispell-british - They no longer have common files, no longer exclude each other - New SuSEconfig module to generate the "english" symlinks -* Thu Dec 13 2001 - werner@suse.de +* Thu Dec 13 2001 werner@suse.de - Fix the sq patch gets versus fgets, the newline problem (#12461) - No backslashspace patch anymore required -* Thu Sep 27 2001 - werner@suse.de +* Thu Sep 27 2001 werner@suse.de - Update to ispell 3.2.06 * port missed patches to 3.2.06 * curent missing patches are ISO part of html mode and maybe backslashspace workaround -* Thu May 17 2001 - werner@suse.de +* Thu May 17 2001 werner@suse.de - Mask all exit status with true on unlinking english.hash -* Mon May 14 2001 - werner@suse.de +* Mon May 14 2001 werner@suse.de - Be sure that exit status is true in preun scripts -* Wed May 09 2001 - mfabian@suse.de +* Wed May 09 2001 mfabian@suse.de - bzip2 sources -* Wed Feb 07 2001 - werner@suse.de +* Wed Feb 07 2001 werner@suse.de - Workaround for broken gcc on IA64 - Split main dif into several patches - Add backslash space patch for TeX text - Add iso-more-html patch for HTML text -* Wed Jan 10 2001 - werner@suse.de +* Wed Jan 10 2001 werner@suse.de - Make temporary files more secure -* Sat Oct 14 2000 - schwab@suse.de +* Sat Oct 14 2000 schwab@suse.de - Do not define bcopy and bzero on Linux. -* Mon Sep 18 2000 - werner@suse.de +* Mon Sep 18 2000 werner@suse.de - Change ispell-emacs-menu.el to fit filter feature in ispell-menu-xemacs of newer ispell.el of XEmacs - Change ispell-emacs-menu.el to add local used dictionary list. -* Sat May 27 2000 - kukuk@suse.de +* Sat May 27 2000 kukuk@suse.de - Use doc macro -* Mon Mar 13 2000 - werner@suse.de +* Mon Mar 13 2000 werner@suse.de - Use tc[sg]etattr if possible - Use correct pointer size depending on __WORDSIZE - Fix common names with ncurses @@ -304,40 +319,40 @@ - Use correct type for {m,re}alloc - Don't require ispell for ibritish and iamerica because ispell requires one of those packages (bootstrapping) -* Fri Feb 25 2000 - kukuk@suse.de +* Fri Feb 25 2000 kukuk@suse.de - Move /usr/{info,man} -> /usr/share/{info,man} -* Mon Sep 27 1999 - bs@suse.de +* Mon Sep 27 1999 bs@suse.de - fixed requirements for sub packages -* Mon Sep 20 1999 - ro@suse.de +* Mon Sep 20 1999 ro@suse.de - added Requires ispell_dictionary for ispell - added Provides ispell_dictionary for ibritish, iamerica -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Jul 14 1999 - werner@suse.de +* Wed Jul 14 1999 werner@suse.de - Avoid load messages during rebuild of emacs spell menue -* Thu Mar 04 1999 - werner@suse.de +* Thu Mar 04 1999 werner@suse.de - Preparing for a better (x)emacs interface: Implement a emacs lisp file to create the spell menus modular on the fly in both emacs and xemacs Edit pulldown. -* Fri Nov 13 1998 - bs@suse.de +* Fri Nov 13 1998 bs@suse.de - fixed spec file (double entry Summary) -* Thu Nov 12 1998 - bs@suse.de +* Thu Nov 12 1998 bs@suse.de - fixed spec file for new rpm. -* Thu Sep 10 1998 - ro@suse.de +* Thu Sep 10 1998 ro@suse.de - catch redefinition of strcmp in ijoin.c -* Thu Jul 09 1998 - werner@suse.de +* Thu Jul 09 1998 werner@suse.de - Some preun scripts for ibritish and iamerica -* Thu Jul 09 1998 - werner@suse.de +* Thu Jul 09 1998 werner@suse.de - Split ispell into ispell for binaries and two packages ibritish and iamerica (excluding each other) -* Fri Feb 06 1998 - werner@suse.de +* Fri Feb 06 1998 werner@suse.de - Move hk2-deutsch to igerman and dicts package - Fix flag handling (flags []^_` are not reconginzed by isalpha) - Fix bug in fix8bit (wrong handling of second figure of a hex number) -* Fri Oct 17 1997 - werner@suse.de +* Fri Oct 17 1997 werner@suse.de - Move description from pac to /usr/doc/packages/ispell - Fix ispell.texinfo -* Thu Feb 06 1997 - werner@suse.de +* Thu Feb 06 1997 werner@suse.de - Repacked - A small modification: Now there is an environment variable CHARSET which will be used if and only if the environment variable ++++++ ispell-3.3.02-getline.patch ++++++ --- correct.c +++ correct.c @@ -246,7 +246,7 @@ struct flagent * sufent, ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN], int * nsaved)); -static char * getline P ((char * buf, int bufsize)); +static char * my_getline P ((char * buf, int bufsize)); void askmode P ((void)); void copyout P ((unsigned char ** cc, int cnt)); static void lookharder P ((unsigned char * string)); @@ -572,7 +572,7 @@ imove (li - 1, 0); (void) putchar ('!'); - if (getline ((char *) buf, sizeof buf) == NULL) + if (my_getline ((char *) buf, sizeof buf) == NULL) { (void) putchar (7); ierase (); @@ -597,7 +597,7 @@ (void) printf ("%s ", CORR_C_READONLY); } (void) printf (CORR_C_REPLACE_WITH); - if (getline ((char *) ctok, ctokl) == NULL) + if (my_getline ((char *) ctok, ctokl) == NULL) { (void) putchar (7); /* Put it back */ @@ -665,7 +665,7 @@ unsigned char buf[100]; imove (li - 1, 0); (void) printf (CORR_C_LOOKUP_PROMPT); - if (getline ((char *) buf, sizeof buf) == NULL) + if (my_getline ((char *) buf, sizeof buf) == NULL) { (void) putchar (7); ierase (); @@ -1584,7 +1584,7 @@ return; } -static char * getline (s, len) +static char * my_getline (s, len) register char * s; register int len; { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org