[packages/hfst-ospell] - updated to 0.5.1 (note: new soname, requires C++14 now) - updated demos patch

[qboosh]

commit ef825f117c5d781c2231257a20d3052b51049b46
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 23 13:29:25 2018 +0100

    - updated to 0.5.1 (note: new soname, requires C++14 now)
    - updated demos patch

 hfst-ospell-demos.patch | 23 +++++++++++------------
 hfst-ospell.spec        | 17 +++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/hfst-ospell.spec b/hfst-ospell.spec
index 2aa6e11..63dc344 100644
--- a/hfst-ospell.spec
+++ b/hfst-ospell.spec
@@ -1,20 +1,21 @@
 Summary:	hfst-ospell library and toy commandline tester
 Summary(pl.UTF-8):	Biblioteka hfst-ospell i program testowy
 Name:		hfst-ospell
-Version:	0.4.5
-Release:	2
+Version:	0.5.1
+Release:	1
 License:	Apache v2.0
 Group:		Applications/Text
 #Source0Download: https://github.com/hfst/hfst-ospell/releases
 Source0:	https://github.com/hfst/hfst-ospell/releases/download/v%{version}/hfstospell-%{version}.tar.gz
-# Source0-md5:	d38110c9992f956aadaf5b9b76172cad
+# Source0-md5:	3073a4d9f396de735f0a8ad257007497
 Patch0:		%{name}-demos.patch
 URL:		http://hfst.github.io/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	libarchive-devel >= 2
+BuildRequires:	libarchive-devel >= 3.0.1
 BuildRequires:	libicu-devel >= 4
-BuildRequires:	libstdc++-devel >= 6:4.7
+# -std=c++14
+BuildRequires:	libstdc++-devel >= 6:5.0
 BuildRequires:	libxml++2-devel >= 2.10.0
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	pkgconfig
@@ -37,9 +38,9 @@ Summary:	Header files for hfst-ospell library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki hfst-ospell
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libarchive-devel >= 2
+Requires:	libarchive-devel >= 3.0.1
 Requires:	libicu-devel >= 4
-Requires:	libstdc++-devel >= 6:4.7
+Requires:	libstdc++-devel >= 6:5.0
 Requires:	libxml++2-devel >= 2.10.0
 
 %description devel
@@ -105,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/hfst-ospell-office
 %attr(755,root,root) %{_bindir}/hfst-ospell-survey
 %attr(755,root,root) %{_libdir}/libhfstospell.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhfstospell.so.10
+%attr(755,root,root) %ghost %{_libdir}/libhfstospell.so.11
 %{_mandir}/man1/hfst-ospell.1*
 %{_mandir}/man1/hfst-ospell-office.1*
 
diff --git a/hfst-ospell-demos.patch b/hfst-ospell-demos.patch
index 602f334..5b88b4d 100644
--- a/hfst-ospell-demos.patch
+++ b/hfst-ospell-demos.patch
@@ -1,6 +1,6 @@
---- hfstospell-0.4.0/main-fsmnlp-2012.cc.orig	2012-09-04 14:43:05.000000000 +0200
-+++ hfstospell-0.4.0/main-fsmnlp-2012.cc	2015-12-28 19:01:30.869303121 +0100
-@@ -255,15 +255,7 @@ zhfst_spell(char* zhfst_filename)
+--- hfstospell-0.5.1/main-fsmnlp-2012.cc.orig	2018-12-23 12:21:00.382926906 +0100
++++ hfstospell-0.5.1/main-fsmnlp-2012.cc	2018-12-23 12:26:11.379590021 +0100
+@@ -254,14 +254,6 @@
      {
        std::cerr << "cannot read zhfst archive " << zhfst_filename << ":" 
            << std::endl
@@ -8,7 +8,7 @@
 -          << "trying to read as legacy automata directory" << std::endl;
 -      speller.read_legacy(zhfst_filename);
 -    }
--  catch (hfst_ol::ZHfstLegacyReadingError zhlre)
+-  catch (hfst_ospell::ZHfstLegacyReadingError zhlre)
 -    {
 -      std::cerr << "cannot read legacy hfst speller dir " << zhfst_filename 
 -          << ":" << std::endl
@@ -16,11 +16,9 @@
 +          << zhzre.what() << "." << std::endl;
        return EXIT_FAILURE;
      }
- 
---- hfstospell-0.4.0/main-ispell.cc.orig	2014-04-28 11:05:20.000000000 +0200
-+++ hfstospell-0.4.0/main-ispell.cc	2015-12-28 18:51:52.375994063 +0100
-@@ -279,20 +279,8 @@ zhfst_spell(char* zhfst_filename, FILE*
-     catch (hfst_ol::ZHfstZipReadingError zhzre)
+--- hfstospell-0.5.1/main-ispell.cc.orig	2018-12-23 12:29:17.532921229 +0100
++++ hfstospell-0.5.1/main-ispell.cc	2018-12-23 12:31:18.382919851 +0100
+@@ -280,19 +280,7 @@
        {
          std::cerr << "cannot read zhfst archive " << zhfst_filename << ":" 
 -          << zhzre.what() << "." << std::endl
@@ -29,15 +27,16 @@
 -          {
 -            speller.read_legacy(zhfst_filename);
 -          }
--        catch (hfst_ol::ZHfstLegacyReadingError zhlre)
+-        catch (hfst_ospell::ZHfstLegacyReadingError zhlre)
 -          {
 -            std::cerr << "cannot fallback to read legacy hfst speller dir " 
 -              << zhfst_filename 
 -              << ":" << std::endl
 -              << zhlre.what() << "." << std::endl;
-+          << zhzre.what() << "." << std::endl;
-             return EXIT_FAILURE;
+-            return EXIT_FAILURE;
 -          }
++          << zhzre.what() << "." << std::endl;
++        return EXIT_FAILURE;
        }
      if (verbose)
        {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hfst-ospell.git/commitdiff/ef825f117c5d781c2231257a20d3052b51049b46