From dd35899a73f3d59f1fdc17a31706d5390141086a3d77ac083f98336c5917fed0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Jun 2021 09:42:09 +0000 Subject: [PATCH] - Update to release 3.15.5 OBS-URL: https://build.opensuse.org/package/show/devel:tools/hfst?expand=0&rev=12 --- hfst-3.15.4.tar.bz2 | 3 -- hfst.changes | 8 +++++ hfst.spec | 44 ++++++++++++++------------- system-foma.diff | 72 +++++++++++++++++++++++++++++++++++++++++++++ v3.15.5.tar.gz | 3 ++ 5 files changed, 106 insertions(+), 24 deletions(-) delete mode 100644 hfst-3.15.4.tar.bz2 create mode 100644 system-foma.diff create mode 100644 v3.15.5.tar.gz diff --git a/hfst-3.15.4.tar.bz2 b/hfst-3.15.4.tar.bz2 deleted file mode 100644 index b7c7d46..0000000 --- a/hfst-3.15.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8de70133b9ac11757158fba812b3e7979e685c1abcaffabf50bff7b3dcc3276 -size 1911515 diff --git a/hfst.changes b/hfst.changes index f6f338f..ffaa380 100644 --- a/hfst.changes +++ b/hfst.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 27 10:02:31 UTC 2021 - Jan Engelhardt + +- Update to release 3.15.5 + * pmatch: modified tracking of entry points to allow for RTNs + in captures + * pmatch: fixed off-by-one bug in checking captures + ------------------------------------------------------------------- Sat Feb 13 21:59:39 UTC 2021 - Jan Engelhardt diff --git a/hfst.spec b/hfst.spec index fed6011..2d7d4bd 100644 --- a/hfst.spec +++ b/hfst.spec @@ -17,28 +17,30 @@ Name: hfst -Version: 3.15.4 +Version: 3.15.5 Release: 0 Summary: Helsinki Finite-State Transducer Technology -License: GPL-3.0-or-later AND GPL-3.0-only AND GPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-only AND Apache-2.0 +License: Apache-2.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND GPL-3.0-only Group: Development/Tools/Other URL: https://hfst.github.io/ -Source: https://github.com/hfst/hfst/releases/download/v%version/hfst-%version.tar.bz2 -Patch1: hfst-wrong-flags.diff -Patch2: hfst-split-libs.diff -Patch3: hfst-nodate.diff +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 BuildRequires: bison BuildRequires: doxygen BuildRequires: fdupes BuildRequires: flex +BuildRequires: foma-devel BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: pkg-config -BuildRequires: python +BuildRequires: python3-base BuildRequires: readline-devel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxml-2.0) @@ -71,12 +73,12 @@ Group: System/Libraries OpenFst is a library for constructing, combining, optimizing, and searching weighted finite-state transducers (FSTs). -%package -n libhfst53 +%package -n libhfst54 Summary: Helsinki Finite-State Transducer Technology Libraries License: GPL-3.0-only Group: System/Libraries -%description -n libhfst53 +%description -n libhfst54 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. @@ -97,7 +99,7 @@ technology. Summary: Development files for the Helsinki Finite-State Transducer License: GPL-3.0-only Group: Development/Libraries/C and C++ -Requires: libhfst53 = %version +Requires: libhfst54 = %version %description devel The Helsinki Finite-State Transducer software is intended for the @@ -109,26 +111,30 @@ 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" -make %{?_smp_mflags} +%make_build %install %make_install -rm -f "%buildroot/%_libdir"/*.la +rm -fv "%buildroot/%_libdir"/*.la # headers not installed -rm -f "%buildroot/%_libdir/"{libfoma,libfst,libsfst}.so +rm -fv "%buildroot/%_libdir/"{libfoma,libfst,libsfst}.so %fdupes %buildroot/%_prefix +%check +%make_build check + %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 libhfst53 -p /sbin/ldconfig -%postun -n libhfst53 -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 @@ -137,16 +143,12 @@ rm -f "%buildroot/%_libdir/"{libfoma,libfst,libsfst}.so %_mandir/man1/*.1* %doc AUTHORS COPYING NEWS README -%files -n libfoma-hfst0 -%_libdir/libfoma-hfst.so.0* -%doc back-ends/foma/COPYING - %files -n libfst-hfst0 %_libdir/libfst-hfst.so.0* %doc back-ends/openfst/COPYING -%files -n libhfst53 -%_libdir/libhfst.so.53* +%files -n libhfst54 +%_libdir/libhfst.so.54* %files -n libsfst-hfst0 %_libdir/libsfst-hfst.so.0* diff --git a/system-foma.diff b/system-foma.diff new file mode 100644 index 0000000..d1c5f92 --- /dev/null +++ b/system-foma.diff @@ -0,0 +1,72 @@ +--- + 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" diff --git a/v3.15.5.tar.gz b/v3.15.5.tar.gz new file mode 100644 index 0000000..9f48189 --- /dev/null +++ b/v3.15.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:025332ab3717771b1d0849babf4bd9bd368b5395e441a557cfc9b5d52f88f2ec +size 23958294