PR#2: Accomodate Nuspell by putting the dictionary dir in its own subpackage - rpms/hunspell

rpms / hunspell

#2 Accomodate Nuspell by putting the dictionary dir in its own subpackage

Merged 3 years ago by caolanm. Opened 3 years ago by mavit.

rpms/ mavit/hunspell nuspell into rawhide

Accomodate Nuspell by putting the dictionary dir in its own subpackage

Peter Oliver • 3 years ago

3e59a6e

hunspell.spec

file modified

+15 -2

		`@@ -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 @@`
		`%endif`
		`BuildRequires: make`
		`Requires: hunspell-en-US`
		`+ Requires: hunspell-filesystem`

		`Patch0: 0001-invalid-read-memory-access-624.patch`

		`@@ -34,6 +35,13 @@`
		`%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 @@`
		`%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 @@`
		`%{_mandir}/man3/hunspell.3.gz`
		`%{_mandir}/man5/hunspell.5.gz`

		`+ %files filesystem`
		`+ %{_datadir}/myspell`
		`+`
		`%changelog`
		`+ * Wed Feb 03 2021 Peter Oliver <rpm@mavit.org.uk> - 1.7.0-9`
		`+ - Accomodate Nuspell by putting the dictionary dir in its own subpackage.`
		`+`
		`* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-8`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`

mavit commented 3 years ago

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.

mavit commented 3 years ago

rishi commented 3 years ago

I don't see any corresponding code change. If the change has already been merged, maybe this pull request should be closed.

rishi commented 3 years ago

Sorry, ignore me. Just a race between me looking and you updating the branch. :)

mavit commented 3 years ago

Yes, master got renamed to rawhide shortly after I pushed, and it took me a little while to work out how to fix that :-)

caolanm commented 3 years ago

I suppose it doesn't hurt to make this change so let merge it

Pull-Request has been merged by caolanm

3 years ago

Metadata

Assignee

None

Tags

No Tags

Changes Summary 1

+15 -2

file changed

hunspell.spec

rpms / hunspell

Source Code

#2 Accomodate Nuspell by putting the dictionary dir in its own subpackage Merged 3 years ago by caolanm. Opened 3 years ago by mavit. rpms/ mavit/hunspell nuspell into rawhide

Metadata

Changes Summary 1

#2 Accomodate Nuspell by putting the dictionary dir in its own subpackage

Merged 3 years ago by caolanm. Opened 3 years ago by mavit.

rpms/ mavit/hunspell nuspell into rawhide