diff --git a/hfst-split-libs.diff b/hfst-split-libs.diff deleted file mode 100644 index 7fa2cc6..0000000 --- a/hfst-split-libs.diff +++ /dev/null @@ -1,74 +0,0 @@ -From: Jan Engelhardt -Date: 2014-09-12 10:29:55.446630599 +0200 -X-Upstream: likely not - -Install sublibraries such that we can make them separate packages -and tag these with their licenses. ---- - back-ends/foma/Makefile.am | 4 +++- - back-ends/openfst/src/lib/Makefile.am | 3 ++- - back-ends/sfst/Makefile.am | 5 +++-- - 3 files changed, 8 insertions(+), 4 deletions(-) - -Index: hfst-3.15.4/back-ends/foma/Makefile.am -=================================================================== ---- hfst-3.15.4.orig/back-ends/foma/Makefile.am -+++ hfst-3.15.4/back-ends/foma/Makefile.am -@@ -9,7 +9,7 @@ AM_CPPFLAGS += -D__NO_MINGW_LFS - endif - - if WANT_FOMA --noinst_LTLIBRARIES = libfoma.la -+lib_LTLIBRARIES = libfoma.la - endif - - lex.yy.c: regex.l regex.h -@@ -27,6 +27,7 @@ lex.cmatrix.c: cmatrix.l - regex.c regex.h: regex.y constructions.o - $(YACC) --defines=regex.h --output=regex.c $< - -+libfoma_la_LDFLAGS = -release hfst -version-number 0 -no-undefined - libfoma_la_SOURCES = int_stack.c define.c determinize.c apply.c \ - rewrite.c lexcread.c topsort.c flags.c minimize.c reverse.c \ - extract.c sigma.c structures.c constructions.c \ -@@ -55,6 +56,7 @@ endif - - if GENERATE_FOMA_WRAPPER - bin_PROGRAMS=hfst_foma -+libfoma_la_LIBADD = -lz - AM_CPPFLAGS += -DZLIB - endif - -Index: hfst-3.15.4/back-ends/openfst/src/lib/Makefile.am -=================================================================== ---- hfst-3.15.4.orig/back-ends/openfst/src/lib/Makefile.am -+++ hfst-3.15.4/back-ends/openfst/src/lib/Makefile.am -@@ -11,6 +11,7 @@ - - AUTOMAKE_OPTIONS=subdir-objects - AM_CPPFLAGS = -I $(srcdir)/../include $(ICU_CPPFLAGS) --noinst_LTLIBRARIES = libfst.la -+lib_LTLIBRARIES = libfst.la -+libfst_la_LDFLAGS = -release hfst -version-number 0 -no-undefined - libfst_la_SOURCES = compat.cc flags.cc fst.cc properties.cc \ - symbol-table.cc symbol-table-ops.cc util.cc -Index: hfst-3.15.4/back-ends/sfst/Makefile.am -=================================================================== ---- hfst-3.15.4.orig/back-ends/sfst/Makefile.am -+++ hfst-3.15.4/back-ends/sfst/Makefile.am -@@ -1,12 +1,13 @@ - AM_CPPFLAGS=-Wno-deprecated - - if WANT_SFST --noinst_LTLIBRARIES = libsfst.la -+lib_LTLIBRARIES = libsfst.la - endif - if WANT_LEAN_SFST --noinst_LTLIBRARIES = libsfst.la -+lib_LTLIBRARIES = libsfst.la - endif - -+libsfst_la_LDFLAGS = -release hfst -version-number 0 -no-undefined - libsfst_la_SOURCES = alphabet.cc basic.cc utf8.cc compact.cc fst.cc \ - operators.cc determinise.cc generate.cc hopcroft.cc - diff --git a/hfst-wrong-flags.diff b/hfst-wrong-flags.diff deleted file mode 100644 index f23dbe9..0000000 --- a/hfst-wrong-flags.diff +++ /dev/null @@ -1,41 +0,0 @@ -Date: 2014-09-12 11:37:08.444984219 +0200 -From: Jan Engelhardt - -build: fix potential linking hazards - --L/-l belong into LDADD/LIBADD, *not* LDFLAGS. - ---- - back-ends/foma/Makefile.am | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -Index: hfst-3.12.2/back-ends/foma/Makefile.am -=================================================================== ---- hfst-3.12.2.orig/back-ends/foma/Makefile.am -+++ hfst-3.12.2/back-ends/foma/Makefile.am -@@ -17,20 +17,19 @@ libfoma_la_SOURCES = int_stack.c define. - - hfst_foma_LDADD = $(top_builddir)/back-ends/foma/libfoma.la - -+hfst_foma_LDADD += -lz - if WANT_READLINE --hfst_foma_LDFLAGS=-lreadline -lz --else --hfst_foma_LDFLAGS=-lz -+hfst_foma_LDADD += -lreadline - endif - - if HAVE_TERMCAP --hfst_foma_LDFLAGS += -ltermcap -+hfst_foma_LDADD += -ltermcap - else - if HAVE_NCURSES --hfst_foma_LDFLAGS += -lncurses -+hfst_foma_LDADD += -lncurses - else - if HAVE_CURSES --hfst_foma_LDFLAGS += -lcurses -+hfst_foma_LDADD += -lcurses - endif - endif - endif diff --git a/hfst.changes b/hfst.changes index ffaa380..690bc65 100644 --- a/hfst.changes +++ b/hfst.changes @@ -5,6 +5,8 @@ Thu May 27 10:02:31 UTC 2021 - Jan Engelhardt * pmatch: modified tracking of entry points to allow for RTNs in captures * pmatch: fixed off-by-one bug in checking captures +- Remove hfst-split-libs.diff, hfst-wrong-flags.diff, + system-foma.diff (obsolete) ------------------------------------------------------------------- Sat Feb 13 21:59:39 UTC 2021 - Jan Engelhardt diff --git a/hfst.spec b/hfst.spec index 2d7d4bd..d477855 100644 --- a/hfst.spec +++ b/hfst.spec @@ -25,9 +25,6 @@ Group: Development/Tools/Other URL: https://hfst.github.io/ Source: https://github.com/hfst/hfst/archive/refs/tags/v%version.tar.gz -Patch1: system-foma.diff -Patch2: hfst-wrong-flags.diff -Patch3: hfst-split-libs.diff Patch4: hfst-nodate.diff BuildRequires: autoconf BuildRequires: automake @@ -35,7 +32,7 @@ BuildRequires: bison BuildRequires: doxygen BuildRequires: fdupes BuildRequires: flex -BuildRequires: foma-devel +BuildRequires: foma-devel >= 0.9.18+git20210604 BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: ncurses-devel @@ -64,15 +61,6 @@ applications ranging from natural language processing and research in automata theory. It should be upwardly compatible with Xerox xfst and lexc, with the exception of binary file reading and writing. -%package -n libfst-hfst0 -Summary: OpenFST Finite State Transducer library -License: Apache-2.0 -Group: System/Libraries - -%description -n libfst-hfst0 -OpenFst is a library for constructing, combining, optimizing, and -searching weighted finite-state transducers (FSTs). - %package -n libhfst54 Summary: Helsinki Finite-State Transducer Technology Libraries License: GPL-3.0-only @@ -83,18 +71,6 @@ The Helsinki Finite-State Transducer software is intended for the implementation of morphological analyzers and other tools which are based on weighted and unweighted finite-state transducer technology. -%package -n libsfst-hfst0 -Summary: SFST Finite State Tools -# HFST is missing the license file; a look in SFST upstream code -# (https://code.google.com/p/cistern/wiki/SFST) reveals it is GPL-2.0. -License: GPL-2.0-only -Group: System/Libraries - -%description -n libsfst-hfst0 -SFST is a toolkit for the implementation of morphological analyzers -and other tools which are based on finite state transducer -technology. - %package devel Summary: Development files for the Helsinki Finite-State Transducer License: GPL-3.0-only @@ -111,12 +87,12 @@ want to make use of the HFST library. %prep %autosetup -p1 -rm -Rfv back-ends/foma/ %build autoreconf -fiv %configure --disable-static --with-unicode-handler=glib --with-readline \ - --enable-all-tools --includedir="%_includedir/%name" + --enable-all-tools --includedir="%_includedir/%name" \ + --with-foma-upstream %make_build %install @@ -127,32 +103,22 @@ rm -fv "%buildroot/%_libdir/"{libfoma,libfst,libsfst}.so %fdupes %buildroot/%_prefix %check -%make_build check +%make_build check -j1 %post -n libfoma-hfst0 -p /sbin/ldconfig %postun -n libfoma-hfst0 -p /sbin/ldconfig -%post -n libfst-hfst0 -p /sbin/ldconfig -%postun -n libfst-hfst0 -p /sbin/ldconfig %post -n libhfst54 -p /sbin/ldconfig %postun -n libhfst54 -p /sbin/ldconfig -%post -n libsfst-hfst0 -p /sbin/ldconfig -%postun -n libsfst-hfst0 -p /sbin/ldconfig %files %_bindir/hfst* %_mandir/man1/*.1* -%doc AUTHORS COPYING NEWS README - -%files -n libfst-hfst0 -%_libdir/libfst-hfst.so.0* -%doc back-ends/openfst/COPYING +%doc NEWS README +%license COPYING %files -n libhfst54 %_libdir/libhfst.so.54* -%files -n libsfst-hfst0 -%_libdir/libsfst-hfst.so.0* - %files devel %_includedir/* %_libdir/libhfst.so diff --git a/system-foma.diff b/system-foma.diff deleted file mode 100644 index d1c5f92..0000000 --- a/system-foma.diff +++ /dev/null @@ -1,72 +0,0 @@ ---- - back-ends/Makefile.am | 2 +- - configure.ac | 1 - - libhfst/src/Makefile.am | 2 +- - libhfst/src/implementations/ConvertFomaTransducer.cc | 3 ++- - libhfst/src/implementations/FomaTransducer.cc | 3 ++- - 5 files changed, 6 insertions(+), 5 deletions(-) - -Index: hfst-3.15.5/back-ends/Makefile.am -=================================================================== ---- hfst-3.15.5.orig/back-ends/Makefile.am -+++ hfst-3.15.5/back-ends/Makefile.am -@@ -15,5 +15,5 @@ - ## You should have received a copy of the GNU General Public License - ## along with this program. If not, see . - --SUBDIRS=openfst openfstwin dlfcn sfst foma -+SUBDIRS=openfst openfstwin dlfcn sfst - AUTOMAKE_OPTIONS=subdir-objects -Index: hfst-3.15.5/configure.ac -=================================================================== ---- hfst-3.15.5.orig/configure.ac -+++ hfst-3.15.5/configure.ac -@@ -812,7 +812,6 @@ AC_CONFIG_FILES([Makefile doc/Makefile t - back-ends/openfst/Makefile - back-ends/openfst/src/Makefile - back-ends/openfst/src/lib/Makefile -- back-ends/foma/Makefile - back-ends/sfst/Makefile - man/Makefile - scripts/Makefile]) -Index: hfst-3.15.5/libhfst/src/Makefile.am -=================================================================== ---- hfst-3.15.5.orig/libhfst/src/Makefile.am -+++ hfst-3.15.5/libhfst/src/Makefile.am -@@ -41,7 +41,7 @@ endif - endif - - if WANT_FOMA -- libhfst_la_LIBADD += $(top_builddir)/back-ends/foma/libfoma.la -+ libhfst_la_LIBADD += -lfoma - endif - - if WANT_MINGW -Index: hfst-3.15.5/libhfst/src/implementations/ConvertFomaTransducer.cc -=================================================================== ---- hfst-3.15.5.orig/libhfst/src/implementations/ConvertFomaTransducer.cc -+++ hfst-3.15.5/libhfst/src/implementations/ConvertFomaTransducer.cc -@@ -17,7 +17,8 @@ - - #ifndef _FOMALIB_H_ - #define _FOMALIB_H_ -- #include "back-ends/foma/fomalib.h" -+ #include -+ #include - #endif - - #include "ConvertTransducerFormat.h" -Index: hfst-3.15.5/libhfst/src/implementations/FomaTransducer.cc -=================================================================== ---- hfst-3.15.5.orig/libhfst/src/implementations/FomaTransducer.cc -+++ hfst-3.15.5/libhfst/src/implementations/FomaTransducer.cc -@@ -17,7 +17,8 @@ - - #ifndef _FOMALIB_H_ - #define _FOMALIB_H_ --#include "back-ends/foma/fomalib.h" -+#include -+#include - #endif - - #include "FomaTransducer.h"