From 72119ee4caef852e49fdc8fdeba4fbe3cc729e8028ad7f42b8a51571dbff6674 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Feb 2024 14:38:22 +0000 Subject: [PATCH] - Update to release 1.8.3 OBS-URL: https://build.opensuse.org/package/show/science/openfst?expand=0&rev=3 --- i586-80bitfp.patch | 19 +++++++++---------- openfst-1.8.2.tar.gz | 3 --- openfst-1.8.3.tar.gz | 3 +++ openfst.changes | 11 +++++++++++ openfst.spec | 16 ++++++++-------- 5 files changed, 31 insertions(+), 21 deletions(-) delete mode 100644 openfst-1.8.2.tar.gz create mode 100644 openfst-1.8.3.tar.gz diff --git a/i586-80bitfp.patch b/i586-80bitfp.patch index 80159f2..20a3e34 100644 --- a/i586-80bitfp.patch +++ b/i586-80bitfp.patch @@ -8,11 +8,11 @@ Modeled upon a similar patch for opensuse's ICU package. src/include/fst/float-weight.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) -Index: openfst-1.8.2/configure.ac +Index: openfst-1.8.3/configure.ac =================================================================== ---- openfst-1.8.2.orig/configure.ac -+++ openfst-1.8.2/configure.ac -@@ -156,11 +156,11 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([ +--- openfst-1.8.3.orig/configure.ac ++++ openfst-1.8.3/configure.ac +@@ -160,10 +160,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([ #include template @@ -20,17 +20,16 @@ Index: openfst-1.8.2/configure.ac + bool FloatEqIsReflexive(volatile T m) { volatile T x = 1.111; x *= m; - - T y = 1.111; + volatile T y = 1.111; y *= m; - return x == y; -Index: openfst-1.8.2/src/include/fst/float-weight.h + } +Index: openfst-1.8.3/src/include/fst/float-weight.h =================================================================== ---- openfst-1.8.2.orig/src/include/fst/float-weight.h -+++ openfst-1.8.2/src/include/fst/float-weight.h -@@ -117,7 +117,9 @@ constexpr bool operator==(const FloatWei +--- openfst-1.8.3.orig/src/include/fst/float-weight.h ++++ openfst-1.8.3/src/include/fst/float-weight.h +@@ -121,7 +121,9 @@ constexpr bool operator==(const FloatWei // register may cause it to compare unequal to that same weight when // stored to memory. This breaks =='s reflexivity, in turn breaking // NaturalLess. diff --git a/openfst-1.8.2.tar.gz b/openfst-1.8.2.tar.gz deleted file mode 100644 index a925e28..0000000 --- a/openfst-1.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de987bf3624721c5d5ba321af95751898e4f4bb41c8a36e2d64f0627656d8b42 -size 1342793 diff --git a/openfst-1.8.3.tar.gz b/openfst-1.8.3.tar.gz new file mode 100644 index 0000000..84f6604 --- /dev/null +++ b/openfst-1.8.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:077714159d5cf3e38a80b6c6656d3ccc2c8b8b6c50bb41bb65c5fec10796bf53 +size 1457815 diff --git a/openfst.changes b/openfst.changes index 6068775..344c74c 100644 --- a/openfst.changes +++ b/openfst.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Feb 8 13:43:36 UTC 2024 - Jan Engelhardt + +- Update to release 1.8.3 + * Eliminated negative label option in `SymbolTable` + * Changed `allow_negative_labels` arg of `SymbolTable.read_text` to + keyword-only in pywrapfst + * Added `FastNumStates` method + * Split `cc-visitors.h` from `connect.h` + * Standardized default seeds for `fstrandgen` + ------------------------------------------------------------------- Mon Jul 5 09:33:46 UTC 2021 - Jan Engelhardt diff --git a/openfst.spec b/openfst.spec index 9b8c1d8..eea989d 100644 --- a/openfst.spec +++ b/openfst.spec @@ -1,7 +1,7 @@ # # spec file for package openfst # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define lname libfst25 +%define lname libfst26 Name: openfst -Version: 1.8.2 +Version: 1.8.3 Release: 0 Summary: Weighted finite-state transducer library License: Apache-2.0 @@ -26,8 +26,8 @@ Group: Development/Libraries/C and C++ URL: http://www.openfst.org/ Source: http://www.openfst.org/twiki/pub/FST/FstDownload/%name-%version.tar.gz Patch1: i586-80bitfp.patch -%if 0%{?suse_version} && 0%{?suse_version} < 1550 -BuildRequires: gcc10-c++ >= 8.1.0 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 +BuildRequires: gcc12-c++ >= 8.1.0 %else BuildRequires: gcc-c++ >= 8.1.0 %endif @@ -61,8 +61,8 @@ searching weighted finite-state transducers (FSTs). %autosetup -p1 %build -%if 0%{?suse_version} && 0%{?suse_version} < 1550 -export CXX=g++-10 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 +export CXX=g++-12 %endif autoreconf -fi %configure @@ -80,7 +80,7 @@ find %buildroot/%_libdir -type f -name "*.la" -print -delete %_bindir/fst* %files -n %lname -%_libdir/lib*.so.25* +%_libdir/lib*fst*.so.* %files devel %_includedir/fst/