update to latest upstream release (3.0.0)

csdiff.spec

@@ -13,8 +13,8 @@
 %bcond_without python3
 
 Name:       csdiff
-Version:    2.9.0
-Release:    2%{?dist}
+Version:    3.0.0
+Release:    1%{?dist}
 Summary:    Non-interactive tools for processing code scan results in plain-text
 
 License:    GPLv3+
@@ -29,14 +29,27 @@ Source2:    kdudka.pgp
 # https://github.com/csutils/csmock/commit/48b09b3a
 Conflicts:  csmock-plugin-shellcheck <= 2.5
 
+# Use Boost 1.69 on EPEL 7
+%if 0%{?rhel} == 7
+BuildRequires: boost169-devel
+%endif
+# Use Boost 1.78 on EPEL 8 and 9
+%if 0%{?rhel} == 8 || 0%{?rhel} == 9
+BuildRequires: boost1.78-devel
+%endif
+# Use boost-devel everywhere else
+%if 0%{?rhel} > 9 || 0%{?fedora}
 BuildRequires: boost-devel
+%endif
+
 BuildRequires: cmake3
 BuildRequires: gcc-c++
 BuildRequires: gnupg2
 BuildRequires: help2man
 BuildRequires: make
 
-%if 0%{?rhel} && 0%{?rhel} < 9
+%if 0%{?rhel} == 7
+Provides: bundled(boost_json)
 Provides: bundled(boost_nowide)
 %endif
 
@@ -59,16 +72,6 @@ code scan defect lists to find out added or fixed defects.
 %if %{with python3}
 %package -n python3-%{name}
 Summary:        Python interface to csdiff for Python 3
-
-# this package redefines %%{python3_pkgversion} to 36 because there is
-# no boost-python3-devel in epel-7 buildroot, only boost-python36-devel
-%if 0%{?rhel} == 7
-BuildRequires:  epel-rpm-macros
-%endif
-# in f33 boost-python3-devel was merged into boost-devel
-%if 0%{?rhel} && 0%{?rhel} < 9
-BuildRequires:  boost-python%{python3_pkgversion}-devel
-%endif
 BuildRequires:  python3-devel
 %py_provides    python3-%{name}
 
@@ -82,6 +85,12 @@ code scan defect lists to find out added or fixed defects.
 %autosetup
 
 %build
+%if 0%{?rhel} == 7
+# Set paths for CMake's FindBoost
+export BOOST_INCLUDEDIR=/usr/include/boost169
+export BOOST_LIBRARYDIR=/usr/lib64/boost169
+%endif
+
 make version.cc
 %cmake3                                    \
     -DPYCSDIFF_PYTHON2=%{?with_python2:ON} \
@@ -124,6 +133,9 @@ make version.cc
 %endif
 
 %changelog
+* Fri Mar 10 2023 Kamil Dudka <kdudka@redhat.com> 3.0.0-1
+- update to latest upstream release
+
 * Thu Feb 23 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.0-2
 - Rebuilt for Boost 1.81 (rhbz#2172687)
 

sources

@@ -1,2 +1,2 @@
-SHA512 (csdiff-2.9.0.tar.xz) = db7840b2755555b9358fbda1b57399b1573f9bfaef9e2ac940b478a01407960b8e50f7ce9bb7be930d316920b48e58e763e64d5d059a9af48bd8a919855bad06
-SHA512 (csdiff-2.9.0.tar.xz.asc) = 356f02dfeb5b56be4ed52e86be093b4c2d0cef6e1edec0dea38e9508e08fd0ebe2d034f56c8edf3e550f8c69075e294dbc6aab71bb167ac5f81fef238fd299a7
+SHA512 (csdiff-3.0.0.tar.xz) = 61e5d51ad6d82131c2f6b0eac5c6b34df6c1fbaa65e39ac8001e552351cbaba6c273f6bd0f3280f599ce7d36deb4bf50575d4dc6875ef7b7c130eb0daf60d856
+SHA512 (csdiff-3.0.0.tar.xz.asc) = dbbb78ac1d1a57ad3000b3b475e473c70d415f4c2c856bbf3f12d3a06281d53e02d7b1d023460a22b96a35348a33b61028c020d1299f1734d22613d20cc61eee