diff --git a/openfst.spec b/openfst.spec index 5f2f8af..632b68f 100644 --- a/openfst.spec +++ b/openfst.spec @@ -1,6 +1,6 @@ Name: openfst Version: 1.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Weighted finite-state transducer library Group: Development/Libraries @@ -62,20 +62,22 @@ functionality. %setup -q %patch0 -# Add missing linkage and remove unnecessary linkage +# Add missing linkage, remove unnecessary linkage, and make sure libraries +# are built in the correct order so linkage is possible. sed -e 's|^LIBS = |LIBS = -ldl|' -i src/lib/Makefile.in -sed -e 's|^LIBS = |LIBS = -L../lib/.libs -lfst -ldl|' -i src/script/Makefile.in -sed -e 's|^LIBS = |LIBS = -L../../lib/.libs -lfst -ldl|' \ +sed -e 's|^LIBS = |LIBS = ../lib/libfst.la -ldl|' -i src/script/Makefile.in +sed -e 's|^LIBS = |LIBS = ../../lib/libfst.la -ldl|' \ -i src/extensions/compact/Makefile.in -sed -e 's|^LIBS = |LIBS = -L../../lib/.libs -lfst -ldl|' \ +sed -e 's|^LIBS = |LIBS = ../../lib/libfst.la -ldl|' \ -i src/extensions/const/Makefile.in -sed -e 's|^LIBS = |LIBS = -L../../lib/.libs -lfst -ldl|' \ +sed -e 's|^LIBS = |LIBS = ../../lib/libfst.la -ldl|' \ -i src/extensions/lookahead/Makefile.in -sed -e 's|^LIBS = |LIBS = -L../../lib/.libs -lfst -ldl|' \ - -e 's|^libfstpdtscript_la_LIBADD.*|libfstpdtscript_la_LIBADD = -L../../script/.libs -lfstscript|' \ +sed -e 's|^LIBS = |LIBS = ../../lib/libfst.la -ldl|' \ + -e 's|^libfstpdtscript_la_LIBADD.*|libfstpdtscript_la_LIBADD = ../../script/libfstscript.la|' \ -i src/extensions/pdt/Makefile.in sed -e 's|-lm -ldl|-ldl|' \ - -e 's|^libfstfarscript_la_LIBADD.*|libfstfarscript_la_LIBADD = -L../../lib/.libs -L.libs -lfst -lfstfar -ldl -licuuc|' \ + -e 's|^libfstfarscript_la_LIBADD.*|libfstfarscript_la_LIBADD = ../../lib/libfs libfstfar.la -ldl -licuuc|' \ + -e 's|^@HAVE_SCRIPT_TRUE@libfst_LTLIBRARIES =.*|@HAVE_SCRIPT_TRUE@libfst_LTLIBRARIES = libfstfar.la libfstfarscript.la|' \ -i src/extensions/far/Makefile.in %build @@ -155,5 +157,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* Wed May 18 2011 Jerry James - 1.2.7-2 +- Fix incorrect target order in far extension Makefile. Thanks to Dan HorĂ¡k + for the analysis. + * Wed Mar 2 2011 Jerry James - 1.2.7-1 - Initial RPM