[packages/voikko-fi] - updated to 2.2; malaga version is gone

[qboosh]

commit 29dca0c4e86808c9527a9577346579db0596e1f6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 23 23:44:33 2018 +0100

    - updated to 2.2; malaga version is gone

 voikko-fi.spec | 49 ++++++++-----------------------------------------
 1 file changed, 8 insertions(+), 41 deletions(-)
---
diff --git a/voikko-fi.spec b/voikko-fi.spec
index 4c8e1b2..d6a7f14 100644
--- a/voikko-fi.spec
+++ b/voikko-fi.spec
@@ -1,22 +1,17 @@
 # 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:		voikko-fi
-Version:	2.1
+Version:	2.2
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 #Source0Download: https://github.com/voikko/corevoikko/releases
 Source0:	https://github.com/voikko/corevoikko/archive/rel-voikko-fi-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	d92d85476f5e841e46a179408e6ab450
-URL:		http://voikko.puimula.org/
-%{?with_vfst:BuildRequires:	foma}
+# Source0-md5:	b0682dc0a930d808150e0b729cfe3e0f
+URL:		https://voikko.puimula.org/
+BuildRequires:	foma
 BuildRequires:	libstdc++-devel
-BuildRequires:	malaga >= 7.8
 BuildRequires:	python3 >= 1:3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,21 +21,6 @@ Description of Finnish morphology written in Malaga.
 %description -l pl.UTF-8
 Opis morfologii języka fińskiego napisany w języku Malaga.
 
-%package 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 malaga
-Finish dictionary for voikko spellchecker/hyphenator.
-
-%description malaga -l pl.UTF-8
-Słownik fiński dla narzędzia sprawdzania pisowni/przenoszenia wyrazów
-voikko.
-
 %package 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
@@ -48,6 +28,8 @@ Group:		Applications/Text
 Requires:	libvoikko >= 4.0
 Provides:	voikko-fi = %{version}
 Obsoletes:	voikko-fi < %{version}
+# malaga libvoikko interface is obsolete
+Obsoletes:	voikko-fi-malaga < 2.2
 
 %description vfst
 Finish dictionary for voikko spellchecker/hyphenator.
@@ -62,35 +44,20 @@ voikko.
 %setup -q -n corevoikko-rel-voikko-fi-%{version}
 
 %build
-%{__make} -C voikko-fi all %{?with_vfst:vvfst}
+%{__make} -C voikko-fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C voikko-fi voikko-install \
-	DESTDIR=$RPM_BUILD_ROOT%{_libdir}/voikko
-
-%if %{with vfst}
 %{__make} -C voikko-fi vvfst-install \
 	DESTDIR=$RPM_BUILD_ROOT%{_datadir}/voikko
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -n voikko-fi-malaga
-%defattr(644,root,root,755)
-%doc voikko-fi/{CONTRIBUTORS,ChangeLog,README}
-%lang(fi) %doc voikko-fi/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 voikko-fi/{CONTRIBUTORS,ChangeLog,README}
-%lang(fi) %doc voikko-fi/README.fi
+%doc voikko-fi/{CONTRIBUTORS,ChangeLog,README.md}
 %{_datadir}/voikko/5/mor-standard/autocorr.vfst
 %{_datadir}/voikko/5/mor-standard/index.txt
 %{_datadir}/voikko/5/mor-standard/mor.vfst
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/voikko-fi.git/commitdiff/29dca0c4e86808c9527a9577346579db0596e1f6