Accepting request 1189319 from M17N

OBS-URL: https://build.opensuse.org/request/show/1189319
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nuspell?expand=0&rev=10

nuspell-5.1.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdf344c5adbcc6797940f8f8cb75cb59f5a3794eb21b9547751a11782a792ef7
-size 371512

nuspell-5.1.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d4baa1daf833a18dc06ae0af0571d9574cc849d47daff6b9ce11dac0a5ded6a
+size 373260

nuspell.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Jul 24 04:32:43 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Disable man file generation to avoid BuildRequires on pandoc
+  (nuspell is a Ring1 package).
+
+-------------------------------------------------------------------
+Wed Jul 17 04:38:53 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.1.6:
+  * Be more explicit about Pandoc dependency, do not quietly
+    continue building if it is not found. 
+  * Fix compatibility with older versions of Pandoc.
+- Changes from version 5.1.5:
+  * Added man-page for the CLI tool. Pandoc is again dependency
+    for building.
+  * Fix edge case when parsing LONG flags in the .aff file.
+- New BuildRequires: pandoc to build man file.
+
+-------------------------------------------------------------------
+Wed Mar 20 12:02:20 UTC 2024 - Richard Biener <rguenther@suse.com>
+
+- Avoid relying on macro expansion in BuildRequires as that breaks
+  Substitute.
+
 -------------------------------------------------------------------
 Wed Nov 22 07:52:25 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
 

nuspell.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nuspell
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,13 +20,14 @@
 %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
 %bcond_with tests
 %else
 %bcond_without tests
 %endif
+# Ring1 package, avoid pandoc requirement by disabling mnan file generation
+%bcond_with man
 Name:           nuspell
-Version:        5.1.4
+Version:        5.1.6
 Release:        0
 Summary:        A spell checker library and command-line tool
 License:        LGPL-3.0-or-later
@@ -36,12 +37,19 @@ Source:         https://github.com/nuspell/nuspell/archive/v%{version}.tar.gz#/%
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  gcc%{?gcc_ver}-c++
+%if 0%{?suse_version} < 1550
+BuildRequires:  gcc10-c++
+%else
+BuildRequires:  gcc-c++
+%endif
 BuildRequires:  graphviz
 BuildRequires:  libicu-devel
 BuildRequires:  pkgconfig
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:ronn)
 Requires:       hunspell
+%if %{with man}
+BuildRequires:  pandoc
+%endif
 %if %{with tests}
 BuildRequires:  pkgconfig(catch2) >= 3.3.2
 %endif
@@ -102,11 +110,13 @@ This package provides API documentation for Nuspell.
 %build
 %cmake -DBUILD_SHARED_LIBS:BOOL=ON \
 %if 0%{?suse_version} < 1550
-       -DCMAKE_CXX_COMPILER:STRING=g++-%{?gcc_ver} \
+       -DCMAKE_CXX_COMPILER:STRING=g++-10 \
        -DCMAKE_CXX_FLAGS:STRING="%{optflags} -std=c++17" \
 %endif
        -DBUILD_TESTING:BOOL=%{?with_tests:ON}%{!?with_tests:OFF}  \
-       -DCMAKE_SKIP_RPATH:BOOL=OFF
+       -DCMAKE_SKIP_RPATH:BOOL=OFF \
+       -DBUILD_DOCS=%{?with_man:ON}%{!?with_man:OFF} \
+       %{nil}
 %cmake_build
 
 cd ../
@@ -132,11 +142,16 @@ cp -pR doxygen/html %{buildroot}%{_docdir}/%{name}-doc/
 %doc README.md CHANGELOG.md AUTHORS
 %license COPYING.LESSER COPYING
 %{_bindir}/nuspell
+%if %{with man}
+%{_mandir}/man1/nuspell.1%{?ext_man}
+%endif
 
 %files -n %{libname}%{sonum}
 %license COPYING.LESSER COPYING
 %{_libdir}/%{libname}.so.*
+%if 0%{?suse_version} < 1650 && 0%{?sle_version} <= 150500
 %exclude %{_datadir}/doc/nuspell/README.md
+%endif
 
 %files devel
 %license COPYING.LESSER COPYING