Hello community, here is the log from the commit of package link-grammar for openSUSE:Factory checked in at Tue Dec 8 11:58:28 CET 2009. -------- --- link-grammar/link-grammar.changes 2009-08-31 20:38:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/link-grammar/link-grammar.changes 2009-12-03 16:59:21.000000000 +0100 @@ -1,0 +2,59 @@ +Thu Dec 3 10:32:29 CET 2009 - vuntz@opensuse.org + +- Update to version 4.6.5: + + Fix: Superlatives without preceeding determiners ("... likes + you best") + + Fix: Take more care in distinguishing mass and count nouns. + + Fix: Old bug w/relative clauses: Rw+ is optional, not + mandatory. + + Provide tags identifying relative, superlative adjectives. + + Remove BioLG NUMBER-AND-UNIT handling, its been superceeded. + + Fix handling of parenthetical phrases/clauses. + + Fix: handling of capitalized first words ending in letter "s". + + Fix: support "filler-it" SF link for "It was reasoned that..." + + Fix: certian WH-word constructions: "I did not know why until + recently" + + Fix: go: "there goes the greatest guy ever" + + Fix: opening coordinating conjunctions: "And you can also ..." + + Configurable Hunspell spell-checker dictionary location. + + Fix: Misc ordinal usage. + + Add support for aspell spell-checker. +- Changes from version 4.6.4: + + Restore nouns starting w/letters x-z, elided in version 4.5.9 + ff. + + Add support for single-word interjections/exclamations! + + Fix: sometimes command line client fails to show all valid + linkages. + + Misc fixes: such_that, upon, acted.v + + Fix: impersonal "be" linking to passive participle. + + Fix: handling of capitalized first words. + + Fix: duplication of certain parses involving transitive verbs. +- Changes from version 4.6.3: + + Fix compilation bug on FreeBSD. + + Fix: allow MX link to post-nominal ", to be ..., " + + Fix: add idiom "time and again" + + Fix: another BioLG regression in handling of possesives. + + Fix: handling of period at end of number at end of sentence. + + Fix: Capitalized words ending in s at start of sentence. + + Use corpus-statistics-based ranking by default, if available. + + Fix difficulties in build of corpus statistics module. +- Changes from version 4.6.2: + + Fix: "come across as authoritiative". + + Improve java location guessing in FreeBSD + + Fix for assert triggered by long sentences. + + Fix: long sequence of periods treated as unknown word. + + Add informational print showing dictionary location on startup. + + Remove duplicated {@MV+} in tend.v + + Automatically resize the display size to fit the current window size. + + Fix handling of punctuation at the end of a capitalized word. + + Fix misc verbs acting as adjectival modifiers: e.g. "given", "allied" + + Fix bug in BioLG code regarding the handling of possesives. + + Fix a (rare) crash in sentences with many conjunctions. + + Fix a crash involving long sequences of UTF8 punctuation marks. +- Add aspell-devel BuildRequires. +- Add link-grammar-fix-warning.patch to fix warnings. +- Add link-grammar-fix-parallel-build.patch to fix parallel build. +- Add link-grammar-libedit-pkgconfig.patch to use pkg-config to + detect libedit flags. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- link-grammar-4.6.1.tar.bz2 New: ---- link-grammar-4.6.5.tar.bz2 link-grammar-fix-parallel-build.patch link-grammar-fix-warning.patch link-grammar-libedit-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ link-grammar.spec ++++++ --- /var/tmp/diff_new_pack.UQULkS/_old 2009-12-08 11:58:13.000000000 +0100 +++ /var/tmp/diff_new_pack.UQULkS/_new 2009-12-08 11:58:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package link-grammar (Version 4.6.1) +# spec file for package link-grammar (Version 4.6.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,13 +18,20 @@ Name: link-grammar -Version: 4.6.1 +Version: 4.6.5 Release: 1 -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: An English grammar checker Url: http://www.abisource.com/projects/link-grammar/ Group: Productivity/Text/Spell Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM link-grammar-fix-warning.patch vuntz@opensuse.org -- Fix various warnings, http://code.google.com/p/link-parser/issues/detail?id=42 +Patch0: link-grammar-fix-warning.patch +# PATCH-FIX-UPSTREAM link-grammar-fix-parallel-build.patch vuntz@opensuse.org -- Fix parallel-build, http://code.google.com/p/link-parser/issues/detail?id=41 +Patch1: link-grammar-fix-parallel-build.patch +# PATCH-FIX-UPSTREAM link-grammar-libedit-pkgconfig.patch vuntz@opensuse.org -- Use pkg-config for libedit detection, http://code.google.com/p/link-parser/issues/detail?id=43 +Patch2: link-grammar-libedit-pkgconfig.patch +BuildRequires: aspell-devel BuildRequires: glibc-devel BuildRequires: hunspell-devel BuildRequires: libedit-devel @@ -40,7 +47,7 @@ sentence (showing noun phrases, verb phrases, etc.). %package devel -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: An English grammar checker (Development files) Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -57,6 +64,9 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build # --enable-sat-solver and --enable-corpus-stats are still at the prototype stage ++++++ link-grammar-4.6.1.tar.bz2 -> link-grammar-4.6.5.tar.bz2 ++++++ ++++ 45135 lines of diff (skipped) ++++++ link-grammar-fix-parallel-build.patch ++++++ Index: link-grammar-4.6.5/link-grammar/Makefile.am =================================================================== --- link-grammar-4.6.5.orig/link-grammar/Makefile.am +++ link-grammar-4.6.5/link-grammar/Makefile.am @@ -190,7 +190,7 @@ link_parser_LDADD += $(top_builddir)/li link_parser_LDADD += $(top_builddir)/link-grammar/minisat/libminisat.la endif -link_parser_LDADD += $(top_builddir)/link-grammar/liblink-grammar.la +link_parser_LDADD += liblink-grammar.la if HAVE_EDITLINE link_parser_LDADD += -ledit -lcurses Index: link-grammar-4.6.5/link-grammar/Makefile.in =================================================================== --- link-grammar-4.6.5.orig/link-grammar/Makefile.in +++ link-grammar-4.6.5/link-grammar/Makefile.in @@ -118,7 +118,7 @@ PROGRAMS = $(bin_PROGRAMS) am_link_parser_OBJECTS = link-parser.$(OBJEXT) link_parser_OBJECTS = $(am_link_parser_OBJECTS) link_parser_DEPENDENCIES = $(am__append_16) \ - $(top_builddir)/link-grammar/liblink-grammar.la \ + liblink-grammar.la \ $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -400,7 +400,7 @@ EXTRA_DIST = \ link_parser_SOURCES = link-parser.c link_parser_LDADD = $(am__append_16) \ - $(top_builddir)/link-grammar/liblink-grammar.la \ + liblink-grammar.la \ $(am__append_17) all: all-recursive ++++++ link-grammar-fix-warning.patch ++++++ Index: link-grammar-4.6.5/link-grammar/spellcheck-hun.c =================================================================== --- link-grammar-4.6.5.orig/link-grammar/spellcheck-hun.c +++ link-grammar-4.6.5/link-grammar/spellcheck-hun.c @@ -12,6 +12,7 @@ /*************************************************************************/ #include <stdio.h> +#include <stdlib.h> #include "link-includes.h" #include "spellcheck.h" Index: link-grammar-4.6.5/link-grammar/link-parser.c =================================================================== --- link-grammar-4.6.5.orig/link-grammar/link-parser.c +++ link-grammar-4.6.5/link-grammar/link-parser.c @@ -505,7 +505,7 @@ int main(int argc, char * argv[]) { FILE *input_fh = stdin; Dictionary dict; - Sentence sent; + Sentence sent = NULL; const char *language="en"; /* default to english, and not locale */ int pp_on=TRUE; int af_on=TRUE; ++++++ link-grammar-libedit-pkgconfig.patch ++++++ Index: link-grammar-4.6.5/configure.in =================================================================== --- link-grammar-4.6.5.orig/configure.in +++ link-grammar-4.6.5/configure.in @@ -239,7 +239,7 @@ GLIB_LC_MESSAGES dnl ==================================================================== -AC_CHECK_HEADER([editline/readline.h], [CPPFLAGS="${CPPFLAGS} -DHAVE_EDITLINE=1" edlin=yes], edlin=no) +PKG_CHECK_MODULES([LIBEDIT], [libedit], [edlin=yes], [edlin=no]) AM_CONDITIONAL(HAVE_EDITLINE, test x${edlin} = xyes) dnl ==================================================================== Index: link-grammar-4.6.5/link-grammar/Makefile.am =================================================================== --- link-grammar-4.6.5.orig/link-grammar/Makefile.am +++ link-grammar-4.6.5/link-grammar/Makefile.am @@ -183,7 +183,7 @@ EXTRA_DIST= # Directives to build the link-parser command-line application bin_PROGRAMS=link-parser link_parser_SOURCES = link-parser.c -link_parser_LDADD = +link_parser_LDADD = $(LIBEDIT_LIBS) if WITH_SAT_SOLVER link_parser_LDADD += $(top_builddir)/link-grammar/sat-solver/libsat-solver.la @@ -192,10 +192,6 @@ endif link_parser_LDADD += liblink-grammar.la -if HAVE_EDITLINE -link_parser_LDADD += -ledit -lcurses -endif - # ----------------------------------------------------------- install-data-local: install-libtool-import-lib Index: link-grammar-4.6.5/link-grammar/Makefile.in =================================================================== --- link-grammar-4.6.5.orig/link-grammar/Makefile.in +++ link-grammar-4.6.5/link-grammar/Makefile.in @@ -59,7 +59,6 @@ host_triplet = @host@ bin_PROGRAMS = link-parser$(EXEEXT) @WITH_SAT_SOLVER_TRUE@am__append_16 = $(top_builddir)/link-grammar/sat-solver/libsat-solver.la \ @WITH_SAT_SOLVER_TRUE@ $(top_builddir)/link-grammar/minisat/libminisat.la -@HAVE_EDITLINE_TRUE@am__append_17 = -ledit -lcurses subdir = link-grammar DIST_COMMON = $(liblink_grammar_include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/link-features.h.in @@ -399,9 +398,9 @@ EXTRA_DIST = \ link-grammar-java.def link_parser_SOURCES = link-parser.c -link_parser_LDADD = $(am__append_16) \ - liblink-grammar.la \ - $(am__append_17) +link_parser_LDADD = $(LIBEDIT_LIBS) \ + $(am__append_16) \ + liblink-grammar.la all: all-recursive .SUFFIXES: Index: link-grammar-4.6.5/configure =================================================================== --- link-grammar-4.6.5.orig/configure +++ link-grammar-4.6.5/configure @@ -18017,136 +18017,75 @@ _ACEOF fi fi - -if test "${ac_cv_header_editline_readline_h+set}" = set; then - { echo "$as_me:$LINENO: checking for editline/readline.h" >&5 -echo $ECHO_N "checking for editline/readline.h... $ECHO_C" >&6; } -if test "${ac_cv_header_editline_readline_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_editline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_editline_readline_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking editline/readline.h usability" >&5 -echo $ECHO_N "checking editline/readline.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <editline/readline.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo "$as_me:$LINENO: $ac_try_echo"") >&5 - (eval "$ac_compile") 2>conftest.er1 +pkg_failed=no +{ echo "$as_me:$LINENO: checking for LIBEDIT" >&5 +echo $ECHO_N "checking for LIBEDIT... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$LIBEDIT_CFLAGS"; then + pkg_cv_LIBEDIT_CFLAGS="$LIBEDIT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: $PKG_CONFIG --exists --print-errors "libedit"") >&5 + ($PKG_CONFIG --exists --print-errors "libedit") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking editline/readline.h presence" >&5 -echo $ECHO_N "checking editline/readline.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <editline/readline.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *"* | *`* | *\*) ac_try_echo=$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo "$as_me:$LINENO: $ac_try_echo"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (exit $ac_status); }; then + pkg_cv_LIBEDIT_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$LIBEDIT_LIBS"; then + pkg_cv_LIBEDIT_LIBS="$LIBEDIT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: $PKG_CONFIG --exists --print-errors "libedit"") >&5 + ($PKG_CONFIG --exists --print-errors "libedit") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: editline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: editline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: editline/readline.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: editline/readline.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: editline/readline.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: editline/readline.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: editline/readline.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: editline/readline.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: editline/readline.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: editline/readline.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: editline/readline.h: section "Present But Cannot Be Compiled"" >&5 -echo "$as_me: WARNING: editline/readline.h: section "Present But Cannot Be Compiled"" >&2;} - { echo "$as_me:$LINENO: WARNING: editline/readline.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: editline/readline.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: editline/readline.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: editline/readline.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for editline/readline.h" >&5 -echo $ECHO_N "checking for editline/readline.h... $ECHO_C" >&6; } -if test "${ac_cv_header_editline_readline_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_editline_readline_h=$ac_header_preproc + (exit $ac_status); }; then + pkg_cv_LIBEDIT_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null` +else + pkg_failed=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_editline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_editline_readline_h" >&6; } + fi +else + pkg_failed=untried +fi + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi -if test $ac_cv_header_editline_readline_h = yes; then - CPPFLAGS="${CPPFLAGS} -DHAVE_EDITLINE=1" edlin=yes + if test $_pkg_short_errors_supported = yes; then + LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libedit"` + else + LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libedit"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBEDIT_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + edlin=no +elif test $pkg_failed = untried; then + edlin=no else - edlin=no + LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS + LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + edlin=yes fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org