.gitignore

@@ -1,2 +1 @@
-SOURCES/gpgkey-AC5D65F10C8596D7E2DAE2633D309B604AE3942E.gpg
+SOURCES/libvoikko-4.1.1.tar.gz
-SOURCES/libvoikko-4.3.tar.gz

.libvoikko.metadata

@@ -1,2 +1 @@
-ee979ffae431d7313da3c0d9c4eca310999a95f1 SOURCES/gpgkey-AC5D65F10C8596D7E2DAE2633D309B604AE3942E.gpg
+c59bbb4dd08d63bbc1cd0bd36408931b20220b4d SOURCES/libvoikko-4.1.1.tar.gz
-72982e2ee5580dc748958382cbe6c4367caa6057 SOURCES/libvoikko-4.3.tar.gz

SOURCES/libvoikko-4.3.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEErF1l8QyFltfi2uJjPTCbYErjlC4FAl2vSfYACgkQPTCbYErj
-lC5sJA/9HyRceDBzMOl9+wS4oxEUH1gd0DLuM6rqWZS5J18ps8mg7NaM06lko5on
-wvnIrKi+lU1HcT6Jg73HAxR8M8z/fCIPbEJFfTPDlhqIWwxFcYqOflrJ6ME1sAUI
-Wjduu/jLrBe9GujVApSnVvvhTWh4qFspl1WRllc/Gxj+CtdlFsqtXGUjdA3JOlCu
-BNsXuwK689uCIdCgROwh/7KSBzbQEYc0c2GtkeoJzkXSHzg+0C89HyyCDhedGcc7
-nMvigU7fhHmnUkoOhHC9/M5jRP1tuozC4VZYP8pUm/WQMIcVAGl3nqcuXLKs8D8P
-WDFOc/9Q01K8QU5zfwv5i07rOXCAyQEyWkFx65AWb9cYSJ+YciHj563U7v4ie/al
-QBVlPJxYerJx9SvGMlGDhykJwdnrU3chFnd2vvzZ21PwE37f0AoSmZx5MlGAjTSD
-YJSSzfhxKF0JZ7ksTZ1CnggQJT96jrFXNbYhOOvyj8hbqunCeMyALJJ95YnTDNR7
-+1hQXXqmvGyfo/2e1aIhPUFFphEtNjcLKjJ1hBIqsLo4npRTAJmklM5c8KSPfREU
-z/BEDji00NuRRhAQGV5Y52VkijhyyiHu/MIhnKGy26ZfqI5NKpwhpkNi3WSvsLL6
-YXBV2CIVLLfl3+ubTxSznNvc/1B3LqeYPCAbuTZ88tl/ekBpMWQ=
-=McWG
------END PGP SIGNATURE-----

SPECS/libvoikko.spec

@@ -1,30 +1,21 @@
-%global _hardened_build 1
-
 Name:           libvoikko
-Version:        4.3
+Version:        4.1.1
-Release:        7%{?dist}
+Release:        3%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
+Group:          System Environment/Libraries
 License:        GPLv2+
-URL:            https://voikko.puimula.org
+URL:            http://voikko.puimula.org
 # The usual format of stable release URLs
-Source0:        https://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-#Source0:        https://www.puimula.org/htp/testing/%%{name}-%%{version}rc1.tar.gz
+#Source0:        http://www.puimula.org/htp/testing/%%{name}-%%{version}rc1.tar.gz
 
-# See https://voikko.puimula.org/sources.html for the key fingerprint.
-# I did
-#  gpg --recv-keys "AC5D 65F1 0C85 96D7 E2DA  E263 3D30 9B60 4AE3 942E"
-# and then
-#  gpg2 --export --export-options export-minimal AC5D65F10C8596D7E2DAE2633D309B604AE3942E > gpgkey-AC5D65F10C8596D7E2DAE2633D309B604AE3942E.gpg
-Source1:        http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz.asc
-Source2:        gpgkey-AC5D65F10C8596D7E2DAE2633D309B604AE3942E.gpg
-
-Requires: voikko-fi
 BuildRequires:  gcc-c++
 BuildRequires:  python3-devel
-BuildRequires: make
+# Require the Finnish morphology because Finnish is currently the only language
-BuildRequires: gnupg2
+# supported by libvoikko in Fedora.
+Requires:       malaga-suomi-voikko
 
 %description
 This is libvoikko, library for spellcheckers and hyphenators using Malaga
@@ -40,6 +31,7 @@ Hunspell.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -49,6 +41,7 @@ developing applications that use %{name}.
 
 %package -n     voikko-tools
 Summary:        Test tools for %{name}
+Group:          Applications/Text
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n voikko-tools
@@ -58,8 +51,10 @@ scripts.
 
 %package -n python3-libvoikko
 Summary:        Python interface to %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
+%{?python_provide:%python_provide python3-libvoikko}
 
 %description -n python3-libvoikko
 Python interface to libvoikko, library of Finnish language tools.
@@ -67,22 +62,18 @@ This module can be used to perform various natural language analysis
 tasks on Finnish text.
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%setup -q
-
-%autosetup
 
 
 %build
-# Use vfst for now, no hfst yet. We need to package hfst-ospell for the hfst dictionaries.
+# The dictionary path must be the same where malaga-suomi-voikko is installed
-# Use /usr/lib/voikko for the dictionaries, this is where the voikko-fi package will put them.
+# Use malaga for now, no hfst or vfst. We need to package foma for the vfst dictionaries.
-# The dictonary path has been agreed on in reviews and fedora-devel discussions.
+%configure --with-dictionary-path=%{_libdir}/voikko --disable-hfst --disable-vfst --disable-buildtools --enable-malaga
-# This way the voikko-fi package can be noarch.
-%configure --disable-hfst --with-dictionary-path=%{_prefix}/lib/voikko
 # Remove rpath,
 # https://fedoraproject.org/wiki/Packaging/Guidelines#Removing_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%make_build CXXFLAGS="$CXXFLAGS"
+make %{?_smp_mflags} CXXFLAGS="$CXXFLAGS"
 
 
 %install
@@ -93,97 +84,47 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 # Install the Python interface
 install -d $RPM_BUILD_ROOT%{python3_sitelib}
 install -pm 0644 python/libvoikko.py $RPM_BUILD_ROOT%{python3_sitelib}/
-# Make the directory for the dictionary data files, so this package can own it.
+
-mkdir -p %{buildroot}%{_prefix}/lib/voikko
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 
 %files
-%doc ChangeLog README
+%doc ChangeLog COPYING README
-%license COPYING
+%{_libdir}/*.so.*
-%dir %{_prefix}/lib/voikko
-%{_libdir}/libvoikko.so.1*
 
 %files -n voikko-tools
 %{_bindir}/voikkospell
 %{_bindir}/voikkohyphenate
 %{_bindir}/voikkogc
-%{_bindir}/voikkovfstc
 %{_mandir}/man1/voikkohyphenate.1*
 %{_mandir}/man1/voikkospell.1*
 %{_mandir}/man1/voikkogc.1*
-%{_mandir}/man1/voikkovfstc.1*
 
 %files devel
 %{_includedir}/*
-%{_libdir}/libvoikko.so
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %files -n python3-libvoikko
-%pycached %{python3_sitelib}/%{name}.py
+%{python3_sitelib}/%{name}.py*
+%if ! 0%{?flatpak}
+%{python3_sitelib}/__pycache__/*
+%endif
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.3-7
+* Wed Jun 30 2021 Mike FABIAN <mfabian@redhat.com> - 4.1.1-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Resolves: rhbz#1975295 Bump release number
-  Related: rhbz#1991688
 
-* Tue Jul 13 2021 Mike FABIAN <mfabian@redhat.com> - 4.3-6
+* Thu Nov 26 2020 Mike FABIAN <mfabian@redhat.com> - 4.1.1-2
-- Resolves: rhbz#1977691 bump release number to add libvoikko-devel package to CRB
+- Fix man file names for Flatpak builds, exclude __pycache__ files from Flatpak builds
+- Resolves: rhbz#1896322
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.3-5
+* Thu Oct 04 2018 Mike FABIAN <mfabian@redhat.com> - 4.1.1-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebase to 4.1.1 from Fedora 29 (provides only python3-libvoikko,
-
+  removes python2-libvoikko)
-* Fri Feb 19 2021 Mike FABIAN <mfabian@redhat.com> - 4.3-4
+- Resolves: rhbz#1636062
-- Add Requires: voikko-fi
-
-* Sun Jan 31 2021 Ville-Pekka Vainio <vpvainio AT iki.fi> - 4.3-3
-- The dictionary data directory will now be /usr/lib/voikko on all architectures
-- Create and own /usr/lib/voikko, so different dictionary packages can own the subdirectories there
-- This was suggested in the review of the voikko-fi package, see rhbz#1919688
-- Use the license macro
-
-* Sun Jan 24 2021 Ville-Pekka Vainio <vpvainio AT iki.fi> - 4.3-2
-- Bump release for a new Copr build
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Jan 16 2021 Ville-Pekka Vainio <vpvainio AT iki.fi> - 4.3-1
-- Update to 4.3
-- Add GPG signature check for the source
-- Fix pycached stuff
-- Remove old python_provide macro
-- Remove ldconfig_scriptlets macro
-- Only use VFST for now, HFST can be provided in a later update
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.1.1-7
-- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 4.1.1-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.1.1-4
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Aug 3 2018 Ville-Pekka Vainio <vpvainio AT iki.fi> - 4.1.1-1
-- New upstream release.
-- Provide only python3-libvoikko, remove python2-libvoikko
-- Use malaga for now, foma is not packaged for Fedora yet.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.8-10
-- Rebuilt for Python 3.7
 
 * Wed May 23 2018 Mike FABIAN <mfabian@redhat.com> - 3.8-9
 - Add python3-devel to BuildRequires.