From fcf39ef99d6be53522eea74d635e708b2dfe929f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Apr 2020 14:27:18 +0200 Subject: backport for remirepo and EL-7 drop voikko sub-package --- enchant2.spec | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/enchant2.spec b/enchant2.spec index 2f151fc..2f57a27 100644 --- a/enchant2.spec +++ b/enchant2.spec @@ -1,3 +1,13 @@ +# remirepo spec file for enchant2, from: +# +# Fedora spec file for enchant2 +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# + Name: enchant2 Version: 2.2.8 Release: 1%{?snap}%{?dist} @@ -17,7 +27,6 @@ BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: aspell-devel BuildRequires: hunspell-devel -BuildRequires: libvoikko-devel Provides: bundled(gnulib) @@ -33,14 +42,6 @@ Requires: enchant2%{?_isa} = %{version}-%{release} %description aspell Libraries necessary to integrate applications using libenchant with aspell. -%package voikko -Summary: Integration with voikko for libenchant -Requires: enchant2%{?_isa} = %{version}-%{release} -Supplements: (enchant2 and langpacks-fi) - -%description voikko -Libraries necessary to integrate applications using libenchant with voikko. - %package devel Summary: Development files for %{name} @@ -53,7 +54,8 @@ developing applications that use %{name}. %prep -%autosetup -p1 -n enchant-%{version} +%setup -n enchant-%{version} +%patch0 -p1 # Needed for Patch0 autoreconf -ifv @@ -64,22 +66,26 @@ autoreconf -ifv --with-aspell \ --with-hunspell-dir=%{_datadir}/myspell \ --without-hspell \ + --without-voikko \ --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g; s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%make_build pkgdatadir=%{_datadir}/enchant-2 +make %{?_smp_mflags} pkgdatadir=%{_datadir}/enchant-2 %install -%make_install pkgdatadir=%{_datadir}/enchant-2 +make install DESTDIR=%{buildroot} pkgdatadir=%{_datadir}/enchant-2 find %{buildroot} -name '*.la' -delete -%ldconfig_scriptlets +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%endif %files -%doc AUTHORS NEWS README +%{!?_licensedir:%global license %%doc} %license COPYING.LIB %{_bindir}/enchant-2 %{_bindir}/enchant-lsmod-2 @@ -92,16 +98,18 @@ find %{buildroot} -name '*.la' -delete %files aspell %{_libdir}/enchant-2/enchant_aspell.so* -%files voikko -%{_libdir}/enchant-2/enchant_voikko.so* - %files devel +%doc AUTHORS NEWS README %{_libdir}/libenchant-2.so %{_libdir}/pkgconfig/enchant-2.pc %{_includedir}/enchant-2 %changelog +* Wed Apr 29 2020 Remi Collet - 2.2.8-1 +- backport for remirepo and EL-7 +- drop voikko sub-package + * Mon Mar 02 2020 Sandro Mani - 2.2.8-1 - Update to 2.2.8 -- cgit