[packages/hfst-ospell] - updated to 0.4.0 - removed obsolete libarchive patch - added demos patch (remove already removed r
qboosh
qboosh at pld-linux.org
Mon Dec 28 19:28:00 CET 2015
commit c2b287cf3bcf94c5b2af7a01a7f2d4419ee8bddc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Dec 28 19:29:43 2015 +0100
- updated to 0.4.0
- removed obsolete libarchive patch
- added demos patch (remove already removed read_legacy usage)
hfst-ospell-demos.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
hfst-ospell-libarchive.patch | 11 -----------
hfst-ospell.spec | 25 +++++++++++++++++--------
3 files changed, 60 insertions(+), 19 deletions(-)
---
diff --git a/hfst-ospell.spec b/hfst-ospell.spec
index 0325493..546f311 100644
--- a/hfst-ospell.spec
+++ b/hfst-ospell.spec
@@ -1,17 +1,18 @@
Summary: hfst-ospell library and toy commandline tester
Summary(pl.UTF-8): Biblioteka hfst-ospell i program testowy
Name: hfst-ospell
-Version: 0.2.3
-Release: 2
+Version: 0.4.0
+Release: 1
License: Apache v2.0
Group: Applications/Text
-Source0: http://downloads.sourceforge.net/hfst/%{name}-%{version}.tar.gz
-# Source0-md5: 753cf07c4a857e0a8b0da613f9bf2642
-Patch0: %{name}-libarchive.patch
+Source0: http://downloads.sourceforge.net/hfst/hfstospell-%{version}.tar.gz
+# Source0-md5: 077d7175187fd50204586e4348e5b119
+Patch0: %{name}-demos.patch
URL: http://hfst.sourceforge.net/
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.11
-BuildRequires: libarchive-devel
+BuildRequires: libarchive-devel >= 2
+BuildRequires: libicu-devel >= 4
BuildRequires: libstdc++-devel
BuildRequires: libxml++-devel >= 2.10.0
BuildRequires: libtool >= 2:2.2.6
@@ -34,7 +35,10 @@ 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: libicu-devel >= 4
Requires: libstdc++-devel
+Requires: libxml++-devel >= 2.10.0
%description devel
Header files for hfst-ospell library.
@@ -55,7 +59,7 @@ Static hfst-ospell library.
Statyczna biblioteka hfst-ospell.
%prep
-%setup -q
+%setup -q -n hfstospell-%{version}
%patch0 -p1
%build
@@ -68,6 +72,7 @@ Statyczna biblioteka hfst-ospell.
HFST_TXT2FST=/usr/bin/hfst-txt2fst \
HFST_FST2FST=/usr/bin/hfst-fst2fst \
ZIP=/usr/bin/zip \
+ --enable-extra-demos \
--disable-silent-rules
%{__make}
@@ -86,13 +91,17 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/hfst-ispell
%attr(755,root,root) %{_bindir}/hfst-ospell
%attr(755,root,root) %{_bindir}/hfst-ospell-cicling
%attr(755,root,root) %{_bindir}/hfst-ospell-fsmnlp-2012
+%attr(755,root,root) %{_bindir}/hfst-ospell-lrec2013
%attr(755,root,root) %{_bindir}/hfst-ospell-norvig
+%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.2
+%attr(755,root,root) %ghost %{_libdir}/libhfstospell.so.5
+%{_mandir}/man1/hfst-ospell.1*
%files devel
%defattr(644,root,root,755)
diff --git a/hfst-ospell-demos.patch b/hfst-ospell-demos.patch
new file mode 100644
index 0000000..602f334
--- /dev/null
+++ b/hfst-ospell-demos.patch
@@ -0,0 +1,43 @@
+--- 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)
+ {
+ std::cerr << "cannot read zhfst archive " << zhfst_filename << ":"
+ << std::endl
+- << zhzre.what() << "." << std::endl
+- << "trying to read as legacy automata directory" << std::endl;
+- speller.read_legacy(zhfst_filename);
+- }
+- catch (hfst_ol::ZHfstLegacyReadingError zhlre)
+- {
+- std::cerr << "cannot read legacy hfst speller dir " << zhfst_filename
+- << ":" << std::endl
+- << zhlre.what() << "." << std::endl;
++ << 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)
+ {
+ std::cerr << "cannot read zhfst archive " << zhfst_filename << ":"
+- << zhzre.what() << "." << std::endl
+- << "trying to read as legacy automata directory" << std::endl;
+- try
+- {
+- speller.read_legacy(zhfst_filename);
+- }
+- catch (hfst_ol::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;
+- }
+ }
+ if (verbose)
+ {
diff --git a/hfst-ospell-libarchive.patch b/hfst-ospell-libarchive.patch
deleted file mode 100644
index 2224833..0000000
--- a/hfst-ospell-libarchive.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hfst-ospell-0.2.3/configure.ac.orig 2013-04-27 13:29:50.000000000 +0200
-+++ hfst-ospell-0.2.3/configure.ac 2013-06-30 09:23:56.184917852 +0200
-@@ -77,7 +77,7 @@
-
- # Checks for libraries
- AS_IF([test x$enable_zhfst != xno],
-- [PKG_CHECK_MODULES([LIBARCHIVE], [libarchive < 3],
-+ [PKG_CHECK_MODULES([LIBARCHIVE], [libarchive],
- [AC_DEFINE([HAVE_LIBARCHIVE], [1], [Use archives])
- enable_zhfst=no].
- [enable_zhfst=yes])])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hfst-ospell.git/commitdiff/c2b287cf3bcf94c5b2af7a01a7f2d4419ee8bddc
More information about the pld-cvs-commit
mailing list