[packages/suomi-malaga] - updated to 1.19 (the last release under that name) - malaga data packaged as voikko-fi-malaga; add

[qboosh]

commit 3ba6c3116068e3bd0a0c742231cca3381cfbc9a5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 15 19:31:20 2017 +0200

    - updated to 1.19 (the last release under that name)
    - malaga data packaged as voikko-fi-malaga; added vfst data as voikko-fi-vfst

 suomi-malaga.spec | 65 +++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 51 insertions(+), 14 deletions(-)
---
diff --git a/suomi-malaga.spec b/suomi-malaga.spec
index f5f848e..954012b 100644
--- a/suomi-malaga.spec
+++ b/suomi-malaga.spec
@@ -1,16 +1,23 @@
+# TODO: sukija (both malaga and vfst)
+#
+# Conditional build:
+%bcond_without	vfst	# dictionaries for VFST backend
+
 Summary:	Description of Finnish morphology written in Malaga
 Summary(pl.UTF-8):	Opis morfologii języka fińskiego napisany w języku Malaga
 Name:		suomi-malaga
-Version:	1.10
+Version:	1.19
 Release:	1
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
-# Source0-md5:	a3517a6aa76d11f16db7231530ad6c29
-URL:		http://voikko.sourceforge.net/
+#Source0Download: https://github.com/voikko/corevoikko/releases
+Source0:	https://github.com/voikko/corevoikko/archive/rel-suomimalaga-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	51f799e600d7c66623d71f7fc44be31d
+URL:		http://voikko.puimula.org/
+%{?with_vfst:BuildRequires:	foma}
 BuildRequires:	libstdc++-devel
 BuildRequires:	malaga >= 7.8
-BuildRequires:	python
+BuildRequires:	python >= 2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -19,43 +26,73 @@ Description of Finnish morphology written in Malaga.
 %description -l pl.UTF-8
 Opis morfologii języka fińskiego napisany w języku Malaga.
 
-%package -n voikko-fi
+%package -n voikko-fi-malaga
 Summary:	Finish dictionary for voikko spellchecker/hyphenator
 Summary(pl.UTF-8):	Słownik fiński dla narzędzia sprawdzania pisowni/przenoszenia wyrazów voikko
 Group:		Applications/Text
 Requires:	libvoikko >= 2.2
+Provides:	voikko-fi = %{version}
+Obsoletes:	voikko-fi < %{version}
 
-%description -n voikko-fi
+%description -n voikko-fi-malaga
 Finish dictionary for voikko spellchecker/hyphenator.
 
-%description -n voikko-fi -l pl.UTF-8
+%description -n voikko-fi-malaga -l pl.UTF-8
+Słownik fiński dla narzędzia sprawdzania pisowni/przenoszenia wyrazów
+voikko.
+
+%package -n voikko-fi-vfst
+Summary:	Finish dictionary for voikko spellchecker/hyphenator
+Summary(pl.UTF-8):	Słownik fiński dla narzędzia sprawdzania pisowni/przenoszenia wyrazów voikko
+Group:		Applications/Text
+Requires:	libvoikko >= 3.8
+Provides:	voikko-fi = %{version}
+Obsoletes:	voikko-fi < %{version}
+
+%description -n voikko-fi-vfst
+Finish dictionary for voikko spellchecker/hyphenator.
+
+%description -n voikko-fi-vfst -l pl.UTF-8
 Słownik fiński dla narzędzia sprawdzania pisowni/przenoszenia wyrazów
 voikko.
 
 #package -n sukija-fi
 
 %prep
-%setup -q
+%setup -q -n corevoikko-rel-suomimalaga-%{version}
 
 %build
-%{__make}
+%{__make} -C suomimalaga all %{?with_vfst:vvfst}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} voikko-install \
+%{__make} -C suomimalaga voikko-install \
 	DESTDIR=$RPM_BUILD_ROOT%{_libdir}/voikko
 
+%if %{with vfst}
+%{__make} -C suomimalaga vvfst-install \
+	DESTDIR=$RPM_BUILD_ROOT%{_datadir}/voikko
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -n voikko-fi
+%files -n voikko-fi-malaga
 %defattr(644,root,root,755)
-%doc CONTRIBUTORS ChangeLog README
-%lang(fi) %doc README.fi
+%doc suomimalaga/{CONTRIBUTORS,ChangeLog,README}
+%lang(fi) %doc suomimalaga/README.fi
 %{_libdir}/voikko/2/mor-standard/voikko-fi_FI.pro
 %{_libdir}/voikko/2/mor-standard/voikko-fi_FI.lex_*
 %{_libdir}/voikko/2/mor-standard/voikko-fi_FI.mor_*
 %{_libdir}/voikko/2/mor-standard/voikko-fi_FI.sym_*
 
+%files -n voikko-fi-vfst
+%defattr(644,root,root,755)
+%doc suomimalaga/{CONTRIBUTORS,ChangeLog,README}
+%lang(fi) %doc suomimalaga/README.fi
+%{_datadir}/voikko/5/mor-standard/autocorr.vfst
+%{_datadir}/voikko/5/mor-standard/index.txt
+%{_datadir}/voikko/5/mor-standard/mor.vfst
+
 #files -n sukija-fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/suomi-malaga.git/commitdiff/3ba6c3116068e3bd0a0c742231cca3381cfbc9a5