SHA256
1
0
forked from pool/hfst

Accepting request 915634 from devel:tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/915634
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hfst?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2021-09-02 21:20:14 +00:00 committed by Git OBS Bridge
commit bc80a95114
6 changed files with 36 additions and 173 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8de70133b9ac11757158fba812b3e7979e685c1abcaffabf50bff7b3dcc3276
size 1911515

View File

@ -1,74 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
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

View File

@ -1,41 +0,0 @@
Date: 2014-09-12 11:37:08.444984219 +0200
From: Jan Engelhardt <jengelh@inai.de>
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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu May 27 10:02:31 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- 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
- Remove hfst-split-libs.diff, hfst-wrong-flags.diff,
system-foma.diff (obsolete)
-------------------------------------------------------------------
Sat Feb 13 21:59:39 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

View File

@ -17,28 +17,27 @@
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
Patch4: hfst-nodate.diff
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: foma-devel >= 0.9.18+git20210604
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)
@ -62,42 +61,21 @@ 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 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.
%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
Group: Development/Libraries/C and C++
Requires: libhfst53 = %version
Requires: libhfst54 = %version
%description devel
The Helsinki Finite-State Transducer software is intended for the
@ -113,43 +91,33 @@ want to make use of the HFST library.
%build
autoreconf -fiv
%configure --disable-static --with-unicode-handler=glib --with-readline \
--enable-all-tools --includedir="%_includedir/%name"
make %{?_smp_mflags}
--enable-all-tools --includedir="%_includedir/%name" \
--with-foma-upstream
%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 -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 libhfst53 -p /sbin/ldconfig
%postun -n libhfst53 -p /sbin/ldconfig
%post -n libsfst-hfst0 -p /sbin/ldconfig
%postun -n libsfst-hfst0 -p /sbin/ldconfig
%post -n libhfst54 -p /sbin/ldconfig
%postun -n libhfst54 -p /sbin/ldconfig
%files
%_bindir/hfst*
%_mandir/man1/*.1*
%doc AUTHORS COPYING NEWS README
%doc NEWS README
%license COPYING
%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 libsfst-hfst0
%_libdir/libsfst-hfst.so.0*
%files -n libhfst54
%_libdir/libhfst.so.54*
%files devel
%_includedir/*

3
v3.15.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:025332ab3717771b1d0849babf4bd9bd368b5395e441a557cfc9b5d52f88f2ec
size 23958294