From a48cdded83d03aa099ba86b4c4a094087eb746fa Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 30 Jun 2013 10:05:04 +0200 Subject: [PATCH] - updated to 0.2.3 - added libarchive patch to allow libarchive 3.x --- hfst-ospell-libarchive.patch | 11 +++++++++++ hfst-ospell.spec | 28 +++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 hfst-ospell-libarchive.patch diff --git a/hfst-ospell-libarchive.patch b/hfst-ospell-libarchive.patch new file mode 100644 index 0000000..2224833 --- /dev/null +++ b/hfst-ospell-libarchive.patch @@ -0,0 +1,11 @@ +--- 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])]) diff --git a/hfst-ospell.spec b/hfst-ospell.spec index f51e36f..64afef3 100644 --- a/hfst-ospell.spec +++ b/hfst-ospell.spec @@ -1,14 +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.1.1 +Version: 0.2.3 Release: 1 License: Apache v2.0 Group: Applications/Text Source0: http://downloads.sourceforge.net/hfst/%{name}-%{version}.tar.gz -# Source0-md5: 98ce8831bf70a604c7d217369bb36572 +# Source0-md5: 753cf07c4a857e0a8b0da613f9bf2642 +Patch0: %{name}-libarchive.patch URL: http://hfst.sourceforge.net/ +BuildRequires: autoconf >= 2.62 +BuildRequires: automake >= 1:1.11 +BuildRequires: libarchive-devel BuildRequires: libstdc++-devel +BuildRequires: libxml++-devel >= 2.10.0 +BuildRequires: libtool >= 2:2.2.6 +BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -49,9 +56,18 @@ Statyczna biblioteka hfst-ospell. %prep %setup -q +%patch0 -p1 %build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} %configure \ + HFST_TXT2FST=/usr/bin/hfst-txt2fst \ + HFST_FST2FST=/usr/bin/hfst-fst2fst \ + ZIP=/usr/bin/zip \ --disable-silent-rules %{__make} @@ -71,14 +87,20 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %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-norvig +%attr(755,root,root) %{_bindir}/hfst-ospell-survey %attr(755,root,root) %{_libdir}/libhfstospell.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhfstospell.so.0 +%attr(755,root,root) %ghost %{_libdir}/libhfstospell.so.2 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libhfstospell.so %{_libdir}/libhfstospell.la +%{_includedir}/ZHfstOspeller*.h %{_includedir}/hfst-ol.h +%{_includedir}/ol-exceptions.h %{_includedir}/ospell.h %{_pkgconfigdir}/hfstospell.pc -- 2.44.0