From 3e59a6e239b92aa3f512e8ce5acbff4092cf89b9 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 3 Feb 2021 13:17:43 +0000 Subject: [PATCH] Accomodate Nuspell by putting the dictionary dir in its own subpackage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Given that itʼs compatible with Hunspell dictionaries, package `nuspell` requires `hunspell-en-US`, which in turn requires `hunspell`. It doesnʼt seem right that installing one spellchecking backend should cause a different one to be pulled in, so this commit seeks to break that chain by giving the `/usr/share/myspell` directory a package of its own. --- hunspell.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index fe64b86..c679b9a 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -18,6 +18,7 @@ BuildRequires: words %endif BuildRequires: make Requires: hunspell-en-US +Requires: hunspell-filesystem Patch0: 0001-invalid-read-memory-access-624.patch @@ -34,6 +35,13 @@ Summary: Files for developing with hunspell %description devel Includes and definitions for developing with hunspell +%package filesystem +Summary: Hunspell filesystem layout + +%description filesystem +Provides a directory in which to store dictionaries provided by other +packages. + %prep %setup -q %patch0 -p1 -b .CVE-2019-16707 @@ -92,7 +100,6 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %files -f %{name}.lang %doc README COPYING COPYING.LESSER COPYING.MPL AUTHORS license.hunspell license.myspell THANKS %{_libdir}/*.so.* -%{_datadir}/myspell %{_bindir}/hunspell %{_mandir}/man1/hunspell.1.gz %lang(hu) %{_mandir}/hu/man1/hunspell.1.gz @@ -117,7 +124,13 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man3/hunspell.3.gz %{_mandir}/man5/hunspell.5.gz +%files filesystem +%{_datadir}/myspell + %changelog +* Wed Feb 03 2021 Peter Oliver - 1.7.0-9 +- Accomodate Nuspell by putting the dictionary dir in its own subpackage. + * Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild