From 262ece1d7598b060c9ff8649f7f3fd8bb851608f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 28 Jun 2013 17:43:04 +0200 Subject: [PATCH] - updated to 1.3.3 (note: new sonames) --- openfst-link.patch | 40 ++++++++++++++++++++-------------------- openfst.spec | 14 ++++++-------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/openfst-link.patch b/openfst-link.patch index bb60237..6b5f4b8 100644 --- a/openfst-link.patch +++ b/openfst-link.patch @@ -1,40 +1,40 @@ ---- openfst-1.2.7/src/lib/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 -+++ openfst-1.2.7/src/lib/Makefile.am 2011-04-23 07:04:02.037016345 +0200 +--- openfst-1.3.3/src/lib/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 ++++ openfst-1.3.3/src/lib/Makefile.am 2011-04-23 07:04:02.037016345 +0200 @@ -4,3 +4,4 @@ lib_LTLIBRARIES = libfst.la libfst_la_SOURCES = compat.cc flags.cc fst.cc properties.cc \ symbol-table.cc util.cc - libfst_la_LDFLAGS = -version-info 0:0:0 + libfst_la_LDFLAGS = -version-info 1:0:0 +libfst_la_LIBADD = -ldl ---- openfst-1.2.7/src/script/Makefile.am.orig 2011-03-12 00:54:42.000000000 +0100 -+++ openfst-1.2.7/src/script/Makefile.am 2011-04-23 07:04:34.287017545 +0200 +--- openfst-1.3.3/src/script/Makefile.am.orig 2011-03-12 00:54:42.000000000 +0100 ++++ openfst-1.3.3/src/script/Makefile.am 2011-04-23 07:04:34.287017545 +0200 @@ -12,4 +12,5 @@ shortest-path.cc synchronize.cc text-io. weight-class.cc - libfstscript_la_LDFLAGS = -version-info 0:0:0 + libfstscript_la_LDFLAGS = -version-info 1:0:0 +libfstscript_la_LIBADD = $(top_builddir)/src/lib/libfst.la $(ICU_FLAGS) -ldl endif ---- openfst-1.2.7/src/extensions/compact/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 -+++ openfst-1.2.7/src/extensions/compact/Makefile.am 2011-05-30 21:11:04.174532124 +0200 +--- openfst-1.3.3/src/extensions/compact/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 ++++ openfst-1.3.3/src/extensions/compact/Makefile.am 2011-05-30 21:11:04.174532124 +0200 @@ -6,6 +6,7 @@ libfstcompact_la_SOURCES = compact8_acceptor-fst.cc compact8_string-fst.cc compact8_unweighted-fst.cc compact8_unweighted_acceptor-fst.cc compact8_weighted_string-fst.cc compact16_acceptor-fst.cc compact16_string-fst.cc compact16_unweighted-fst.cc compact16_unweighted_acceptor-fst.cc compact16_weighted_string-fst.cc compact64_acceptor-fst.cc compact64_string-fst.cc compact64_unweighted-fst.cc compact64_unweighted_acceptor-fst.cc compact64_weighted_string-fst.cc - libfstcompact_la_LDFLAGS = -version-info 0:0:0 + libfstcompact_la_LDFLAGS = -version-info 1:0:0 +libfstcompact_la_LIBADD = $(top_builddir)/src/lib/libfst.la -ldl compact8_acceptor_fst_la_SOURCES = compact8_acceptor-fst.cc compact8_acceptor_fst_la_LDFLAGS = -module ---- openfst-1.2.7/src/extensions/const/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 -+++ openfst-1.2.7/src/extensions/const/Makefile.am 2011-05-30 21:12:20.464534677 +0200 +--- openfst-1.3.3/src/extensions/const/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 ++++ openfst-1.3.3/src/extensions/const/Makefile.am 2011-05-30 21:12:20.464534677 +0200 @@ -6,6 +6,7 @@ libfstconst_la_SOURCES = const8-fst.cc const16-fst.cc const64-fst.cc - libfstconst_la_LDFLAGS = -version-info 0:0:0 + libfstconst_la_LDFLAGS = -version-info 1:0:0 +libfstconst_la_LIBADD = $(top_builddir)/src/lib/libfst.la -ldl const8_fst_la_SOURCES = const8-fst.cc const8_fst_la_LDFLAGS = -module ---- openfst-1.2.7/src/extensions/far/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 -+++ openfst-1.2.7/src/extensions/far/Makefile.am 2011-05-30 21:15:13.067873790 +0200 +--- openfst-1.3.3/src/extensions/far/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 ++++ openfst-1.3.3/src/extensions/far/Makefile.am 2011-05-30 21:15:13.067873790 +0200 @@ -4,7 +4,7 @@ libfstdir = @libfstdir@ @@ -47,13 +47,13 @@ @@ -15,6 +15,7 @@ if HAVE_SCRIPT libfstfarscript_la_SOURCES = farscript.cc compile-strings.cc main.cc - libfstfarscript_la_LDFLAGS = -version-info 0:0:0 + libfstfarscript_la_LDFLAGS = -version-info 1:0:0 +libfstfarscript_la_LIBADD = libfstfar.la $(top_builddir)/src/lib/libfst.la $(ICU_LIBS) -ldl endif if HAVE_BIN ---- openfst-1.2.7/src/extensions/lookahead/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 -+++ openfst-1.2.7/src/extensions/lookahead/Makefile.am 2011-05-30 21:16:34.171209838 +0200 +--- openfst-1.3.3/src/extensions/lookahead/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 ++++ openfst-1.3.3/src/extensions/lookahead/Makefile.am 2011-05-30 21:16:34.171209838 +0200 @@ -8,6 +8,7 @@ libfstlookahead_la_SOURCES = arc_lookahead-fst.cc ilabel_lookahead-fst.cc \ olabel_lookahead-fst.cc @@ -62,11 +62,11 @@ arc_lookahead_fst_la_SOURCES = arc_lookahead-fst.cc arc_lookahead_fst_la_LDFLAGS = -module ---- openfst-1.2.7/src/extensions/pdt/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 -+++ openfst-1.2.7/src/extensions/pdt/Makefile.am 2011-05-30 21:18:50.077881058 +0200 +--- openfst-1.3.3/src/extensions/pdt/Makefile.am.orig 2011-03-12 00:54:41.000000000 +0100 ++++ openfst-1.3.3/src/extensions/pdt/Makefile.am 2011-05-30 21:18:50.077881058 +0200 @@ -32,4 +32,5 @@ libfst_LTLIBRARIES = libfstpdtscript.la libfstpdtscript_la_SOURCES = pdtscript.cc - libfstpdtscript_la_LDFLAGS = -version-info 0:0:0 + libfstpdtscript_la_LDFLAGS = -version-info 1:0:0 +libfstpdtscript_la_LIBADD = $(top_builddir)/src/script/libfstscript.la $(top_builddir)/src/lib/libfst.la -ldl endif diff --git a/openfst.spec b/openfst.spec index 74bf133..8f60eb5 100644 --- a/openfst.spec +++ b/openfst.spec @@ -1,18 +1,17 @@ Summary: OpenFst - library for finite state transducers development Summary(pl.UTF-8): OpenFst - biblioteka do programowania automatów skończonych z wyjściem Name: openfst -Version: 1.3.2 +Version: 1.3.3 Release: 1 License: Apache v2.0 Group: Libraries #Source0Download: http://www.openfst.org/twiki/bin/view/FST/FstDownload Source0: http://www.openfst.org/twiki/pub/FST/FstDownload/%{name}-%{version}.tar.gz -# Source0-md5: 9b0d777f177d9917bb93adef19b7098a +# Source0-md5: c7ba9e791eba501bb9d5b95ccc6e5231 Patch0: %{name}-link.patch URL: http://www.openfst.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: libicu-devel >= 4.2 BuildRequires: libstdc++-devel >= 6:4.1 BuildRequires: libtool >= 2:1.5 BuildRequires: sed >= 4.0 @@ -59,7 +58,7 @@ Statyczna biblioteka OpenFst. %patch0 -p1 # kill am portability warning (there is -Werror) -sed -i -e '/AC_PROG_LIBTOOL/aAM_PROG_AR' configure.ac +%{__sed} -i -e '/AC_PROG_LIBTOOL/iAM_PROG_AR' configure.ac %build %{__libtoolize} @@ -74,8 +73,7 @@ sed -i -e '/AC_PROG_LIBTOOL/aAM_PROG_AR' configure.ac --enable-lookahead-fsts \ --enable-ngram-fsts \ --enable-pdt \ - --enable-static \ - --with-icu + --enable-static %{__make} @@ -100,9 +98,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/fst* %attr(755,root,root) %{_bindir}/pdt* %attr(755,root,root) %{_libdir}/libfst.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libfst.so.0 +%attr(755,root,root) %ghost %{_libdir}/libfst.so.1 %attr(755,root,root) %{_libdir}/libfstscript.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libfstscript.so.0 +%attr(755,root,root) %ghost %{_libdir}/libfstscript.so.1 %dir %{_libdir}/fst %attr(755,root,root) %{_libdir}/fst/*.so* -- 2.44.0