From: Jan Rękorajski Date: Tue, 3 Dec 2013 07:46:23 +0000 (+0100) Subject: - fix variable redefinition X-Git-Tag: auto/th/SFST-1.4.6g-2~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2FSFST.git;a=commitdiff_plain;h=7b428c3c7354db5804063f3f2457c88c3d8481be - fix variable redefinition --- diff --git a/SFST.spec b/SFST.spec index 0b874e3..a6306c6 100644 --- a/SFST.spec +++ b/SFST.spec @@ -7,6 +7,7 @@ License: GPL v2+ Group: Development/Tools Source0: ftp://ftp.ims.uni-stuttgart.de/pub/corpora/SFST/%{name}-%{version}.tar.gz # Source0-md5: 574f124731ab1b87696fdd9b8a6e4a7d +Patch0: build.patch URL: http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html BuildRequires: bison BuildRequires: flex @@ -54,6 +55,7 @@ Pliki nagłówkowe biblioteki SFST. %prep %setup -q -n %{name} +%patch0 -p1 sed -i -e '/^ strip/d' src/Makefile diff --git a/build.patch b/build.patch new file mode 100644 index 0000000..0dd11d4 --- /dev/null +++ b/build.patch @@ -0,0 +1,16 @@ +--- SFST/src/fst.C~ 2012-02-20 13:34:34.000000000 +0100 ++++ SFST/src/fst.C 2013-12-03 08:43:28.287475829 +0100 +@@ -511,11 +511,11 @@ + for( ArcsIter it(node->arcs()); it; it++ ) { + Arc *arc=it; + +- NodeHashSet::iterator it=previous.insert(node).first; ++ NodeHashSet::iterator itp=previous.insert(node).first; + path.push_back(arc->label()); + enumerate_paths_node( arc->target_node(), path, previous, result ); + path.pop_back(); +- previous.erase(it); ++ previous.erase(itp); + } + } +