From 68249f5eb78a7d2979dd21eb51ae8022c0fb546fd0a73a354338cbb7b792f007 Mon Sep 17 00:00:00 2001 From: andy great Date: Thu, 20 Oct 2022 23:52:42 +0000 Subject: [PATCH] Accepting request 1010965 from home:badshah400:Staging Update to version 5.1.1 and use Catch2 < 3.0 for builds (not yet compatible with Catch2 >= 3). OBS-URL: https://build.opensuse.org/request/show/1010965 OBS-URL: https://build.opensuse.org/package/show/M17N/nuspell?expand=0&rev=24 --- nuspell-5.0.0.tar.gz | 3 --- nuspell-5.1.1.tar.gz | 3 +++ nuspell.changes | 33 ++++++++++++++++++++++++++++ nuspell.spec | 52 +++++++++++++++++++++++++++++++++----------- 4 files changed, 75 insertions(+), 16 deletions(-) delete mode 100644 nuspell-5.0.0.tar.gz create mode 100644 nuspell-5.1.1.tar.gz diff --git a/nuspell-5.0.0.tar.gz b/nuspell-5.0.0.tar.gz deleted file mode 100644 index 71ed804..0000000 --- a/nuspell-5.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:855d4771d225dcce1e48d098be6a2d69629c635b79b53f9e095a35adc68f0ea1 -size 372940 diff --git a/nuspell-5.1.1.tar.gz b/nuspell-5.1.1.tar.gz new file mode 100644 index 0000000..ec28845 --- /dev/null +++ b/nuspell-5.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a65cc7414f0123630bd13b7739eda51484b29f6402086b2db7e0deb846083bb0 +size 370879 diff --git a/nuspell.changes b/nuspell.changes index 4fd555f..fda380e 100644 --- a/nuspell.changes +++ b/nuspell.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Sat Oct 8 05:20:22 UTC 2022 - Atri Bhattacharya + +- Update to version 5.1.1: + * Add configuration option BUILD_TOOLS that can be used to + disable building the CLI tool (gh#nuspell/nuspell#122). + * Made error reporting more detailed and robust + (gh#nuspell/nuspell#123). + * Fix compiler warnings regarding usage of deprecated functions. +- Changes from version 5.1.0: + * Add new API for finding dictionaries on the filesystem that + uses facilities from C++17 std::filesystem. + * Simplify CLI tool and removed some unused features from it. + * Deprecate old API for finding dictionaries on the filesystem + that used strings for paths. + * Remove man-page for CLI tool and dependency on pandoc. +- BuildRequires: pkgconfig(catch2) < 3 instead of unversioned + Catch2-devel, since package is not yet compatible with Catch2 + version 3 and higher. +- Require gcc-c++ >= 10 for successful builds, i.e. BuildRequires: + gcc10-c++ for openSUSE < 1550. +- Fix building of API documentation and install it as part of + new doc package; BuildRequires: fdupes, graphviz (for dot). +- Spec file cleanups: + * Install license with every package. + * Remove any doc files from shared lib and install as part of + %{name}: shared lib should contain nothing more than the shared + object(s) and license. + * Move all %libname.so.* files to shared lib package, devel pkg + should contain just the %libname.so symlink amidst other devel + files. + * %{name}-devel pkg dependencies: Add shared lib, drop %{name}. + ------------------------------------------------------------------- Thu Jun 17 07:27:33 UTC 2021 - andy great diff --git a/nuspell.spec b/nuspell.spec index d237977..bd937c9 100644 --- a/nuspell.spec +++ b/nuspell.spec @@ -1,7 +1,7 @@ # # spec file for package nuspell # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,26 @@ %define sonum 5 %define libname libnuspell +# Due to std::filesystem and std::charconv used by code, at least gcc-c++ >= 10 and std=c++17 is required +%if 0%{?suse_version} < 1550 +%define gcc_ver 10 +%endif Name: nuspell -Version: 5.0.0 +Version: 5.1.1 Release: 0 Summary: A spell checker library and command-line tool License: LGPL-3.0-or-later Group: Productivity/Office/Other URL: https://nuspell.github.io/ Source: https://github.com/nuspell/nuspell/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: Catch2-devel BuildRequires: cmake BuildRequires: doxygen -BuildRequires: gcc-c++ +BuildRequires: fdupes +BuildRequires: gcc%{?gcc_ver}-c++ +BuildRequires: graphviz BuildRequires: libicu-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(catch2) < 3 BuildRequires: rubygem(%{rb_default_ruby_abi}:ronn) Requires: hunspell @@ -71,29 +78,43 @@ Main features are: %package devel Summary: Files for developing with Nuspell Group: Development/Libraries/C and C++ -Requires: nuspell = %{version}-%{release} +Requires: %{libname}%{sonum} = %{version} +Recommends: %{name}-doc = %{version} %description devel Header files and definitions for developing with Nuspell. +%package doc +Summary: API documentation for Nuspell +BuildArch: noarch + +%description doc +This package provides API documentation for Nuspell. + %prep %autosetup %build %cmake -DBUILD_SHARED_LIBS:BOOL=ON \ +%if 0%{?suse_version} < 1550 + -DCMAKE_CXX_COMPILER:STRING=g++-%{?gcc_ver} \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags} -std=c++17" \ +%endif -DBUILD_TESTING:BOOL=ON \ - -DCMAKE_SKIP_RPATH:BOOL=OFF \ - .. - + -DCMAKE_SKIP_RPATH:BOOL=OFF %cmake_build -pushd ../ +cd ../ doxygen -popd %install %cmake_install +# Install API doc manually so we can run fdupes on buildroot +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -pR doxygen/html %{buildroot}%{_docdir}/%{name}-doc/ +%fdupes %{buildroot}%{_docdir}/%{name}-doc/ + %post -n %{libname}%{sonum} -p /sbin/ldconfig %postun -n %{libname}%{sonum} -p /sbin/ldconfig @@ -101,19 +122,24 @@ popd %ctest %files -n %{name} +%doc README.md CHANGELOG.md AUTHORS +%license COPYING.LESSER COPYING %{_bindir}/nuspell %files -n %{libname}%{sonum} -%doc README.md CHANGELOG.md AUTHORS %license COPYING.LESSER COPYING -%{_libdir}/%{libname}.so.%{version} +%{_libdir}/%{libname}.so.* %exclude %{_datadir}/doc/nuspell/README.md %files devel +%license COPYING.LESSER COPYING %{_includedir}/%{name} %{_libdir}/%{libname}.so -%{_libdir}/%{libname}.so.%{sonum} %{_libdir}/pkgconfig/nuspell.pc %{_libdir}/cmake/%{name} +%files doc +%license COPYING.LESSER COPYING +%doc %{_docdir}/%{name}-doc/ + %changelog