update to latest upstream (3.1.0)

https://docs.fedoraproject.org/en-US/packaging-guidelines/#_verifying_signatures

> Any detached signature file (e.g. foo.tar.gz.asc or foo.tar.gz.sig) must be
> uploaded to the package lookaside cache alongside the source code, while
> the keyring must be committed directly to the package SCM.

Closes: https://src.fedoraproject.org/rpms/csdiff/pull-request/1

.gitignore

@@ -1 +1,2 @@
 /csdiff-*.tar.xz
+/csdiff-*.tar.xz.asc

csdiff.spec

@@ -1,55 +1,263 @@
+# disable in source builds on EPEL <9
+%undefine __cmake_in_source_build
+%undefine __cmake3_in_source_build
+
+# python2 is not available on RHEL > 7 and Fedora
+%if 0%{?rhel} > 7 || 0%{?fedora}
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
+# python3 support is optional
+%bcond_without python3
+
 Name:       csdiff
-Version:    1.0.8
+Version:    3.1.0
 Release:    1%{?dist}
 Summary:    Non-interactive tools for processing code scan results in plain-text
 
-Group:      Applications/Text
 License:    GPLv3+
-URL:        https://git.fedorahosted.org/cgit/codescan-diff.git
-Source0:    https://git.fedorahosted.org/cgit/codescan-diff.git/snapshot/%{name}-%{version}.tar.xz
+URL:        https://github.com/csutils/csdiff
+Source0:    https://github.com/csutils/csdiff/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
+Source1:    https://github.com/csutils/csdiff/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz.asc
+# gpg --keyserver pgp.mit.edu --recv-key 992A96E075056E79CD8214F9873DB37572A37B36
+# gpg --output kdudka.pgp --armor --export kdudka@redhat.com
+Source2:    kdudka.pgp
 
+# the following upstream commit is needed to work with up2date csdiff/csgrep
+# 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
-BuildRequires: cmake
+%endif
+
+BuildRequires: cmake3
+BuildRequires: gcc-c++
+BuildRequires: gnupg2
 BuildRequires: help2man
+BuildRequires: make
+
+%if 0%{?rhel} == 7
+Provides: bundled(boost_json)
+Provides: bundled(boost_nowide)
+%endif
 
 %description
 This package contains the csdiff tool for comparing code scan defect lists in
 order to find out added or fixed defects, and the csgrep utility for filtering
-defect lists using various filtering predicates. 
+defect lists using various filtering predicates.
+
+%if %{with python2}
+%package -n python2-%{name}
+Summary:        Python interface to csdiff for Python 2
+BuildRequires:  python2-devel
+%py_provides    python2-%{name}
+
+%description -n python2-%{name}
+This package contains the Python 2 binding for the csdiff tool for comparing
+code scan defect lists to find out added or fixed defects.
+%endif
+
+%if %{with python3}
+%package -n python3-%{name}
+Summary:        Python interface to csdiff for Python 3
+BuildRequires:  python3-devel
+%py_provides    python3-%{name}
+
+%description -n python3-%{name}
+This package contains the Python 3 binding for the csdiff tool for comparing
+code scan defect lists to find out added or fixed defects.
+%endif
 
 %prep
-%setup -q
-rm -rf ./boost_*
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%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
-mkdir csdiff_build
-cd csdiff_build
-%cmake ..
-make %{?_smp_mflags} VERBOSE=yes
+%cmake3                                    \
+    -DPYCSDIFF_PYTHON2=%{?with_python2:ON} \
+    -DPYCSDIFF_PYTHON3=%{?with_python3:ON}
+%cmake3_build
 
 %install
-cd csdiff_build
-make install DESTDIR="$RPM_BUILD_ROOT"
+%cmake3_install
 
 %check
-cd csdiff_build
-ctest %{?_smp_mflags} --output-on-failure
+%ctest3
 
 %files
+%doc README
+%license COPYING
 %{_bindir}/csdiff
 %{_bindir}/csgrep
 %{_bindir}/cshtml
 %{_bindir}/cslinker
 %{_bindir}/cssort
+%{_bindir}/cstrans-df-run
+%{_datadir}/%{name}
 %{_mandir}/man1/csdiff.1*
 %{_mandir}/man1/csgrep.1*
 %{_mandir}/man1/cshtml.1*
 %{_mandir}/man1/cslinker.1*
 %{_mandir}/man1/cssort.1*
-%doc COPYING README
+%{_mandir}/man1/cstrans-df-run.1*
+
+%if %{with python2}
+%files -n python2-%{name}
+%license COPYING
+%{python2_sitearch}/pycsdiff.so
+%endif
+
+%if %{with python3}
+%files -n python3-%{name}
+%license COPYING
+%{python3_sitearch}/pycsdiff.so
+%endif
 
 %changelog
+* Tue Oct 10 2023 Kamil Dudka <kdudka@redhat.com> 3.1.0-1
+- update to latest upstream release
+
+* Mon Aug 21 2023 Kamil Dudka <kdudka@redhat.com> 3.0.4-1
+- update to latest upstream release
+
+* Fri Jul 21 2023 Kamil Dudka <kdudka@redhat.com> 3.0.3-1
+- update to latest upstream release
+
+* Fri Apr 21 2023 Kamil Dudka <kdudka@redhat.com> 3.0.2-1
+- update to latest upstream release
+
+* Thu Apr 06 2023 Kamil Dudka <kdudka@redhat.com> 3.0.1-1
+- update to latest upstream
+
+* 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)
+
+* Wed Feb 22 2023 Kamil Dudka <kdudka@redhat.com> 2.9.0-1
+- update to latest upstream release
+
+* Thu Dec 01 2022 Kamil Dudka <kdudka@redhat.com> 2.8.0-1
+- update to latest upstream release
+
+* Tue Sep 06 2022 Kamil Dudka <kdudka@redhat.com> 2.7.0-1
+- update to latest upstream release
+
+* Tue Jun 21 2022 Kamil Dudka <kdudka@redhat.com> 2.6.0-1
+- update to latest upstream release
+
+* Mon May 09 2022 Kamil Dudka <kdudka@redhat.com> 2.5.0-1
+- update to latest upstream release
+
+* Wed Apr 13 2022 Kamil Dudka <kdudka@redhat.com> 2.4.0-1
+- update to latest upstream release
+
+* Tue Mar 15 2022 Miro Hrončok <mhroncok@redhat.com> - 2.3.0-2
+- Verify GPG signature of upstream tarball when building the package
+
+* Tue Mar 15 2022 Kamil Dudka <kdudka@redhat.com> 2.3.0-1
+- update to latest upstream release
+
+* Tue Aug 31 2021 Kamil Dudka <kdudka@redhat.com> 2.2.0-1
+- update to latest upstream release
+
+* Fri May 21 2021 Kamil Dudka <kdudka@redhat.com> 2.1.1-1
+- update to latest upstream release
+
+* Wed Feb 17 2021 Kamil Dudka <kdudka@redhat.com> 2.1.0-1
+- update to latest upstream release
+
+* Fri Jan 08 2021 Kamil Dudka <kdudka@redhat.com> 2.0.0-1
+- update to latest upstream release
+
+* Tue Oct 20 2020 Kamil Dudka <kdudka@redhat.com> 1.9.0-1
+- update to latest upstream release
+
+* Wed Aug 19 2020 Kamil Dudka <kdudka@redhat.com> 1.8.0-1
+- update to latest upstream release
+
+* Tue Mar 31 2020 Kamil Dudka <kdudka@redhat.com> 1.7.1-1
+- update to latest upstream release
+
+* Wed Feb 05 2020 Kamil Dudka <kdudka@redhat.com> 1.7.0-1
+- update to latest upstream release
+
+* Thu May 02 2019 Kamil Dudka <kdudka@redhat.com> 1.6.1-1
+- make pycsdiff build with Python 3.8 (#1705427)
+- update to latest upstream release
+
+* Mon Feb 04 2019 Kamil Dudka <kdudka@redhat.com> 1.6.0-1
+- update to latest upstream release
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 30 2019 Jonathan Wakely <jwakely@redhat.com> - 1.5.0-2
+- Rebuilt and patched for Boost 1.69
+
+* Thu Oct 18 2018 Kamil Dudka <kdudka@redhat.com> 1.5.0-1
+- update to latest upstream release
+
+* Thu May 03 2018 Kamil Dudka <kdudka@redhat.com> 1.4.0-1
+- update to latest upstream release
+- make both python2 and python3 optional
+
+* Mon Feb 19 2018 Kamil Dudka <kdudka@redhat.com> 1.3.3-4
+- add explicit BR for the gcc-c++ compiler
+
+* Mon Jan 15 2018 Kamil Dudka <kdudka@redhat.com> 1.3.3-1
+- update to latest upstream release
+
+* Wed Feb 15 2017 Kamil Dudka <kdudka@redhat.com> 1.3.2-1
+- update to latest upstream release
+- update project URL and source URL
+
+* Wed Sep 14 2016 Kamil Dudka <kdudka@redhat.com> 1.3.1-1
+- update to latest upstream release
+
+* Fri May 20 2016 Kamil Dudka <kdudka@redhat.com> 1.3.0-1
+- update to latest upstream release
+- introduce the python2-csdiff subpackage
+
+* Tue May 26 2015 Kamil Dudka <kdudka@redhat.com> 1.2.3-1
+- update to latest upstream release
+
+* Wed Apr 01 2015 Kamil Dudka <kdudka@redhat.com> 1.2.2-1
+- update to latest upstream release
+
+* Tue Mar 03 2015 Kamil Dudka <kdudka@redhat.com> 1.2.1-1
+- update to latest upstream release
+
+* Mon Jan 19 2015 Kamil Dudka <kdudka@redhat.com> 1.1.3-1
+- update to latest upstream release
+- package the pycsdiff python module
+
+* Fri Nov 07 2014 Kamil Dudka <kdudka@redhat.com> 1.1.1-1
+- update to latest upstream release
+
+* Wed Sep 03 2014 Kamil Dudka <kdudka@redhat.com> 1.0.10-1
+- update to latest upstream bugfix release
+
 * Thu Jul 17 2014 Kamil Dudka <kdudka@redhat.com> 1.0.8-1
 - update to latest upstream bugfix release
 

kdudka.pgp

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+lwvfpMesuQ==
+=XhUt
+-----END PGP PUBLIC KEY BLOCK-----

sources

@@ -1 +1,2 @@
-c92e3489b0b9618981ed4d1e9eae2079  csdiff-1.0.8.tar.xz
+SHA512 (csdiff-3.1.0.tar.xz) = 7dfd04a6a71bb2cb6e455efdb7f20dbee913e552995be1364d8fe0cc09e1ab182edf5d6bde0769430948b414d9acd5146ef2d3b5d2811def5c0c61e37857a878
+SHA512 (csdiff-3.1.0.tar.xz.asc) = e398949b4fbb3da9b2807d768b411d72ec7577af168381e86dceb49bb9694b406f1b22e626745a6776a32019864de326b91c6a9bed653b40c9e2969996f286fa