diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index 4f03aae..0ac7e07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
italiano_2_4_2007_09_01.zip
+/dizionario_italiano-5.1.1.tar.gz
diff --git a/hunspell-it-sf2994177.cleandic.patch b/hunspell-it-sf2994177.cleandic.patch
deleted file mode 100644
index b42a47c..0000000
--- a/hunspell-it-sf2994177.cleandic.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- it_IT.dic 2010-04-29 14:31:47.000000000 +0100
-+++ it_IT.dic 2010-04-29 14:32:07.000000000 +0100
-@@ -1,32 +1,4 @@
--95221
--/ Dizionario italiano
--/
--/ Copyright (C) 2001, 2002 Gianluca Turconi
--/ Copyright (C) 2002, 2003, 2004 Gianluca Turconi and Davide Prina
--/ Copyright (C) 2004, 2005, 2006, 2007 Davide Prina
--/
--/ E-Mail: DavidePrina(CHIOCCIOLA)yahoo(PUNTO)com
--/ home: http://linguistico.sf.net/wiki
--/
--/ Version 2.4 (01/09/2007) (DD/MM/YYYY)
--/
--/ This file is distributed under GPL license.
--/
--/ This file is part of the "dizionario italiano".
--/
--/ The "dizionario italiano" is free software; you can redistribute it and/or
--/ modify it under the terms of the GNU General Public License as published
--/ by the Free Software Foundation; either version 3 of the License, or
--/ (at your option) any later version.
--/
--/ The "dizionario italiano" is distributed in the hope that it will be
--/ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
--/ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--/ GNU General Public License for more details.
--/
--/ You should have received a copy of the GNU General Public
--/ License along with the "dizionario italiano",
--/ if not, see .
-+95195
- a
- ab
- abaco/OTqr
diff --git a/hunspell-it.spec b/hunspell-it.spec
index 3053458..f1ff52d 100644
--- a/hunspell-it.spec
+++ b/hunspell-it.spec
@@ -1,32 +1,39 @@
-Name: hunspell-it
-Summary: Italian hunspell dictionaries
-%global upstreamid 20070901
-Version: 2.4
-Release: 0.21.%{upstreamid}%{?dist}
-Source: http://downloads.sourceforge.net/sourceforge/linguistico/italiano_2_4_2007_09_01.zip
-URL: http://linguistico.sourceforge.net
-License: GPLv3+
-BuildArch: noarch
-Requires: hunspell
-Supplements: (hunspell and langpacks-it)
-#dic contains free-form text inside the .dic, i.e. "error: line 3: bad flagvector"
-# https://sourceforge.net/tracker/?func=detail&aid=2994177&group_id=128318&atid=711333
-Patch0: hunspell-it-sf2994177.cleandic.patch
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
+%global dict_dirname hunspell
+%else
+%global dict_dirname myspell
+%endif
+
+Name: hunspell-it
+Summary: Italian hunspell dictionaries
+Version: 5.1.1
+Release: %autorelease
+# The license text is embedded within the README files
+# Here we specify the hunspell files license only as other files are not packaged
+License: GPL-3.0-only
+URL: https://pagure.io/dizionario_italiano
+Source: %{url}/archive/%{version}/dizionario_italiano-%{version}.tar.gz
+
+BuildArch: noarch
+Requires: hunspell-filesystem
+Supplements: (hunspell and langpacks-it)
%description
Italian hunspell dictionaries.
+
%prep
-%setup -q -c -n hunspell-it
-%patch0 -p0 -b .cleandic
+%autosetup -n dizionario_italiano-%{version}
+
%build
-chmod -x *
+# Nothing to do
+
%install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
-pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+cp -p it_IT.dic it_IT.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+pushd $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/
it_IT_aliases="it_CH"
for lang in $it_IT_aliases; do
ln -s it_IT.aff $lang.aff
@@ -36,77 +43,9 @@ done
%files
-%doc it_IT_README.txt it_IT_COPYING it_IT_AUTHORS it_IT_license.txt it_IT_notes.txt
-%{_datadir}/myspell/*
+%license LICENSES/gpl-3.0.txt
+%doc CHANGELOG.txt README.md README_it_IT.txt
+%{_datadir}/%{dict_dirname}/*
%changelog
-* Wed Jan 29 2020 Fedora Release Engineering - 2.4-0.21.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering - 2.4-0.20.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering - 2.4-0.19.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering - 2.4-0.18.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering - 2.4-0.17.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering - 2.4-0.16.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering - 2.4-0.15.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 19 2016 Parag Nemade - 2.4-0.14.20070901
-- Add Supplements: tag for langpacks naming guidelines
-- Clean the specfile to follow current packaging guidelines
-
-* Thu Feb 04 2016 Fedora Release Engineering - 2.4-0.13.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering - 2.4-0.12.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering - 2.4-0.11.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering - 2.4-0.10.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering - 2.4-0.9.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering - 2.4-0.8.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering - 2.4-0.7.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Feb 09 2011 Fedora Release Engineering - 2.4-0.6.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Apr 29 2010 Caolan McNamara - 2.4-0.5.20070901
-- remove spurious text from .dic
-
-* Tue Jan 05 2010 Caolan McNamara - 2.4-0.4.20070901
-- it_IT_README.1st says GPLv2+, but it_IT_README.txt says GPLv3+ ->
- change license field to GPLv3+
-
-* Fri Jul 24 2009 Fedora Release Engineering - 2.4-0.3.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering - 2.4-0.2.20070901
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Sep 03 2007 Caolan McNamara - 2.4-0.1.20070901
-- latest version
-
-* Fri Aug 03 2007 Caolan McNamara - 2.3-0.2.20060723
-- clarify license version
-
-* Thu Dec 07 2006 Caolan McNamara - 2.3-0.1.20060723
-- initial version
+%autochangelog
diff --git a/plans/hunspell-it.fmf b/plans/hunspell-it.fmf
new file mode 100644
index 0000000..c1627f9
--- /dev/null
+++ b/plans/hunspell-it.fmf
@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+ how: fmf
+execute:
+ how: tmt
diff --git a/sources b/sources
index e79c9be..26ef02c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7fbd9e2dfb25ea3288cdb918e1e1260 italiano_2_4_2007_09_01.zip
+SHA512 (dizionario_italiano-5.1.1.tar.gz) = eedc5771162ba3b7bd451a96883df471a691a07ec74de432c0bb31cb77c4f774df914946d504cfee1e51a615336cff3589139a6b946632729ce5cb3d25469fe2
diff --git a/tests/test_dic_availability.fmf b/tests/test_dic_availability.fmf
new file mode 100644
index 0000000..995bee1
--- /dev/null
+++ b/tests/test_dic_availability.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-it
+test: python3 test_dic_availability.py
+framework: shell
+
diff --git a/tests/test_dic_availability.py b/tests/test_dic_availability.py
new file mode 100644
index 0000000..caf897d
--- /dev/null
+++ b/tests/test_dic_availability.py
@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+
+import enchant
+
+lang = "it_IT"
+try:
+ dic = enchant.request_dict(lang)
+ print("Dictionary for {0} language is available for use".format(lang))
+except enchant.errors.DictNotFoundError:
+ print("Dictionary is not installed for use")
diff --git a/tests/test_suggest_words.fmf b/tests/test_suggest_words.fmf
new file mode 100644
index 0000000..7030c2f
--- /dev/null
+++ b/tests/test_suggest_words.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-it
+test: python3 test_suggest_words.py
+framework: shell
+
diff --git a/tests/test_suggest_words.py b/tests/test_suggest_words.py
new file mode 100644
index 0000000..a289d3d
--- /dev/null
+++ b/tests/test_suggest_words.py
@@ -0,0 +1,9 @@
+#!/usr/bin/python3
+
+import enchant
+
+wdlst = [ "ciao", "tè", "mattina"]
+dic = enchant.Dict("it_IT")
+for wd in wdlst:
+ dic.check(wd)
+ print("input word = {0}, Suggestions => {1}".format(wd, dic.suggest(wd)))