- updated to 1.5.3

- updated python patch
- removed obsolete link patch

diff --git a/openfst-link.patch b/openfst-link.patch
deleted file mode 100644 (file)
index d316fa3..0000000
--- a/openfst-link.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- openfst-1.5.0/src/lib/Makefile.am.orig     2015-12-26 21:06:48.622906025 +0100
-+++ openfst-1.5.0/src/lib/Makefile.am  2015-12-26 22:46:00.295989593 +0100
-@@ -4,3 +4,4 @@
- libfst_la_SOURCES = compat.cc flags.cc fst.cc properties.cc \
- symbol-table.cc util.cc symbol-table-ops.cc mapped-file.cc
- libfst_la_LDFLAGS = -version-info 1:5:0
-+libfst_la_LIBADD = -ldl
---- openfst-1.5.0/src/script/Makefile.am.orig  2011-03-12 00:54:42.000000000 +0100
-+++ openfst-1.5.0/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 1:5:0
-+libfstscript_la_LIBADD = $(top_builddir)/src/lib/libfst.la $(ICU_FLAGS) -ldl
- endif
---- openfst-1.5.0/src/extensions/compact/Makefile.am.orig      2011-03-12 00:54:41.000000000 +0100
-+++ openfst-1.5.0/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 1:5: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.5.0/src/extensions/const/Makefile.am.orig        2011-03-12 00:54:41.000000000 +0100
-+++ openfst-1.5.0/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 1:5: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.5.0/src/extensions/far/Makefile.am.orig  2011-03-12 00:54:41.000000000 +0100
-+++ openfst-1.5.0/src/extensions/far/Makefile.am       2011-05-30 21:15:13.067873790 +0200
-@@ -4,7 +4,7 @@
- libfstdir = @libfstdir@
- 
- if HAVE_SCRIPT
--libfst_LTLIBRARIES = libfstfarscript.la libfstfar.la
-+libfst_LTLIBRARIES = libfstfar.la libfstfarscript.la
- else
- libfst_LTLIBRARIES = libfstfar.la
- endif
-@@ -15,6 +15,7 @@
- if HAVE_SCRIPT
- libfstfarscript_la_SOURCES = farscript.cc compile-strings.cc main.cc
- libfstfarscript_la_LDFLAGS = -version-info 1:5:0
-+libfstfarscript_la_LIBADD = libfstfar.la $(top_builddir)/src/lib/libfst.la $(ICU_LIBS) -ldl
- endif
- 
- if HAVE_BIN
---- openfst-1.5.0/src/extensions/lookahead/Makefile.am.orig    2011-03-12 00:54:41.000000000 +0100
-+++ openfst-1.5.0/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
- libfstlookahead_la_LDFLAGS = -version-info 1:5:0
-+libfstlookahead_la_LIBADD = $(top_builddir)/src/lib/libfst.la -ldl
- 
- arc_lookahead_fst_la_SOURCES = arc_lookahead-fst.cc
- arc_lookahead_fst_la_LDFLAGS = -module
---- openfst-1.5.0/src/extensions/pdt/Makefile.am.orig  2011-03-12 00:54:41.000000000 +0100
-+++ openfst-1.5.0/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 1:5:0
-+libfstpdtscript_la_LIBADD = $(top_builddir)/src/script/libfstscript.la $(top_builddir)/src/lib/libfst.la -ldl
- endif

diff --git a/openfst-python.patch b/openfst-python.patch
index f16f4f94ceb25a6d099e9c1123d87963d95d30b8..c45381df326fe4c0a88b706a3eac7fcb1dc89d39 100644 (file)
--- a/openfst-python.patch
+++ b/openfst-python.patch
@@ -1,16 +1,13 @@
---- openfst-1.5.0/src/extensions/python/Makefile.am.orig       2015-07-01 02:58:24.000000000 +0200
-+++ openfst-1.5.0/src/extensions/python/Makefile.am    2015-12-27 10:40:49.034189720 +0100
-@@ -1,11 +1,10 @@
--python_LTLIBRARIES = fst.la
-+pyexec_LTLIBRARIES = fst.la
+--- openfst-1.5.3/src/extensions/python/Makefile.am.orig       2016-09-02 21:47:46.995731836 +0200
++++ openfst-1.5.3/src/extensions/python/Makefile.am    2016-09-02 21:49:39.489063884 +0200
+@@ -2,9 +2,7 @@
+ # used to generate them. Consequently, modifications to the .pyx files will not
+ # influence the build unless the .cc files are regenerated using Cython.
  
--pyexec_LTILIBRARIES = fst.la
- fst_la_SOURCES = fst.cc
- fst_la_CPPFLAGS = -I$(srcdir)/../../include $(PYTHON_CPPFLAGS)
- fst_la_LDFLAGS = $(PYTHON_LDFLAGS) -avoid-version -module
- fst_la_LIBADD = ../../script/libfstscript.la ../../lib/libfst.la \
--                                                              -lfstscript -lfst -lm -ldl
-+                                                              -lm -ldl
+-python_LTLIBRARIES = pywrapfst.la
+-
+-pyexec_LTILIBRARIES = pywrapfst.la
++pyexec_LTLIBRARIES = pywrapfst.la
  
- # NB: we use the Cython-generated .cc, rather than the .pyx source file, so 
- # modifications to the .pyx will not influence the build.
+ pywrapfst_la_SOURCES = pywrapfst.cc
+ pywrapfst_la_CPPFLAGS = -I$(srcdir)/../../include $(PYTHON_CPPFLAGS)

diff --git a/openfst.spec b/openfst.spec
index bcf4544a9078a53065733d7b19c1e6d18645d72f..16469fc36c214164ef46dba02efb538fd12845ec 100644 (file)
--- a/openfst.spec
+++ b/openfst.spec
@@ -6,15 +6,14 @@
 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.5.0
+Version:       1.5.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: a24fee5ffe28744c6fb7b1a49e0006c4
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-python.patch
+# Source0-md5: f04e580b5bc574571854304c9656a3e2
+Patch0:                %{name}-python.patch
 URL:           http://www.openfst.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -75,7 +74,6 @@ Wiązanie Pythona do biblioteki OpenFst.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -105,10 +103,10 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/fst/*.la \
-       %{?with_python:$RPM_BUILD_ROOT%{py_sitedir}/fst.la}
+       %{?with_python:$RPM_BUILD_ROOT%{py_sitedir}/pywrapfst.la}
 %if %{with static_libs}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/fst/*.a \
-       %{?with_python:$RPM_BUILD_ROOT%{py_sitedir}/fst.a}
+       %{?with_python:$RPM_BUILD_ROOT%{py_sitedir}/pywrapfst.a}
 %endif
 
 %clean
@@ -125,17 +123,57 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mpdt*
 %attr(755,root,root) %{_bindir}/pdt*
 %attr(755,root,root) %{_libdir}/libfst.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfst.so.1
+%attr(755,root,root) %ghost %{_libdir}/libfst.so.4
+%attr(755,root,root) %{_libdir}/libfstcompact.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstcompact.so.4
+%attr(755,root,root) %{_libdir}/libfstcompressscript.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstcompressscript.so.4
+%attr(755,root,root) %{_libdir}/libfstconst.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstconst.so.4
+%attr(755,root,root) %{_libdir}/libfstfar.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstfar.so.4
+%attr(755,root,root) %{_libdir}/libfstfarscript.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstfarscript.so.4
+%attr(755,root,root) %{_libdir}/libfstlinearscript.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstlinearscript.so.4
+%attr(755,root,root) %{_libdir}/libfstlookahead.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstlookahead.so.4
+%attr(755,root,root) %{_libdir}/libfstmpdtscript.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstmpdtscript.so.4
+%attr(755,root,root) %{_libdir}/libfstngram.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstngram.so.4
+%attr(755,root,root) %{_libdir}/libfstpdtscript.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfstpdtscript.so.4
 %attr(755,root,root) %{_libdir}/libfstscript.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfstscript.so.1
+%attr(755,root,root) %ghost %{_libdir}/libfstscript.so.4
 %dir %{_libdir}/fst
 %attr(755,root,root) %{_libdir}/fst/*.so*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfst.so
+%attr(755,root,root) %{_libdir}/libfstcompact.so
+%attr(755,root,root) %{_libdir}/libfstcompressscript.so
+%attr(755,root,root) %{_libdir}/libfstconst.so
+%attr(755,root,root) %{_libdir}/libfstfar.so
+%attr(755,root,root) %{_libdir}/libfstfarscript.so
+%attr(755,root,root) %{_libdir}/libfstlinearscript.so
+%attr(755,root,root) %{_libdir}/libfstlookahead.so
+%attr(755,root,root) %{_libdir}/libfstmpdtscript.so
+%attr(755,root,root) %{_libdir}/libfstngram.so
+%attr(755,root,root) %{_libdir}/libfstpdtscript.so
 %attr(755,root,root) %{_libdir}/libfstscript.so
 %{_libdir}/libfst.la
+%{_libdir}/libfstcompact.la
+%{_libdir}/libfstcompressscript.la
+%{_libdir}/libfstconst.la
+%{_libdir}/libfstfar.la
+%{_libdir}/libfstfarscript.la
+%{_libdir}/libfstlinearscript.la
+%{_libdir}/libfstlookahead.la
+%{_libdir}/libfstmpdtscript.la
+%{_libdir}/libfstngram.la
+%{_libdir}/libfstpdtscript.la
 %{_libdir}/libfstscript.la
 %{_includedir}/fst
 
@@ -143,11 +181,21 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfst.a
+%{_libdir}/libfstcompact.a
+%{_libdir}/libfstcompressscript.a
+%{_libdir}/libfstconst.a
+%{_libdir}/libfstfar.a
+%{_libdir}/libfstfarscript.a
+%{_libdir}/libfstlinearscript.a
+%{_libdir}/libfstlookahead.a
+%{_libdir}/libfstmpdtscript.a
+%{_libdir}/libfstngram.a
+%{_libdir}/libfstpdtscript.a
 %{_libdir}/libfstscript.a
 %endif
 
 %if %{with python}
 %files -n python-openfst
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/fst.so
+%attr(755,root,root) %{py_sitedir}/pywrapfst.so
 %endif