Compare commits
23 Commits
Author | SHA1 | Date |
---|---|---|
Kamil Dudka | 4a18d458a0 | |
Kamil Dudka | 7a0358a84d | |
Kamil Dudka | 57c4b51902 | |
Kamil Dudka | 4c8f052ac6 | |
Kamil Dudka | 6207f01d19 | |
Kamil Dudka | 5f3cae4eb4 | |
Kamil Dudka | af22de7909 | |
Kamil Dudka | 03fb39c573 | |
Kamil Dudka | bf714a4556 | |
Kamil Dudka | ceee0435ce | |
Kamil Dudka | 759c88bc70 | |
Kamil Dudka | bf043776ae | |
Miro Hrončok | 9077f70758 | |
Kamil Dudka | 47d1379e68 | |
Kamil Dudka | bcea6f82d2 | |
Kamil Dudka | a553cd1db4 | |
Kamil Dudka | fc624f8edc | |
Kamil Dudka | eccfcfeb60 | |
Kamil Dudka | 13510442d7 | |
Troy Dawson | 4c40c4abbc | |
Kamil Dudka | ebcbc02ba7 | |
Kamil Dudka | f964e4cdc3 | |
Gwyn Ciesla | 48cd17a6dd |
|
@ -1 +1,2 @@
|
|||
/csdiff-*.tar.xz
|
||||
/csdiff-*.tar.xz.asc
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAl+NwkIACgkQhz2zdXKj
|
||||
ezYkTg/+MsGW+HDmnW7CbhKj1Xi8exELB3E4x+9UAoKQStEENt3c6q1HY4yWaIkz
|
||||
kp1eluGkX8KQlSALDB4gC8Go4UpLJ056qZnKiCREYUAM7Go6WFQyMVRKm91L1g7R
|
||||
cAlc6qAQIVKOn260HuJpQA2ii7UPd01qJXFo/s0JUcjWyvmJSdic7TXMerz/Lsuu
|
||||
ZdsvuULyHamGmG1qzrS86qpKNTcPJQGBmSmAxQ9AkqI08RubrvC9IkEDt1pG8wqo
|
||||
qjhywUnYuimZUFWMwR+Qr58324QL/CUAfXnHILj3BVnnkysa+ZFTNtlO9ICX9cC/
|
||||
BYMHvxkFF2Q7QsyYb8kVEp50n7zsyRuK5D2YgvxSW0rseAtYY+REYjwzjoA8BxNY
|
||||
nqJ5p7FgGHQevL/u4SJ9h/s78cqhZehS3/Xg1o5gFm52y9ATOs+kKzaQCfvzZh3j
|
||||
cPip/vT1gRuRR4jysRknHMhOeP1UfdGEtdX2SOXbGEi6dLe9xBRQYxdkEzVAtSMQ
|
||||
36zG53kgbEY1YJvEVpH+xUQfboZBbCBU+wy9GGU0nik+TJPQzywBrNszQGIAV2fh
|
||||
ULNpRwS5jXP/flpqBhjeNBOsnYcXK/yLMIuS6eNyzacmnkiusuvNogWq/f/KDo+K
|
||||
4d/mjVr8oreS/S3KxYjdlS9tKzoGjRbhIr4nMQ2oE+827Jv+K6k=
|
||||
=7aVw
|
||||
-----END PGP SIGNATURE-----
|
169
csdiff.spec
169
csdiff.spec
|
@ -1,50 +1,68 @@
|
|||
# disable in source builds on EPEL <9
|
||||
%undefine __cmake_in_source_build
|
||||
%undefine __cmake3_in_source_build
|
||||
|
||||
# python3 is not available on RHEL <= 7
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%bcond_without python3
|
||||
%else
|
||||
%bcond_with python3
|
||||
%endif
|
||||
|
||||
# python2 is not available on RHEL > 7 and not needed on Fedora > 29
|
||||
%if 0%{?rhel} > 7 || 0%{?fedora} > 29
|
||||
# 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.9.0
|
||||
Version: 3.1.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Non-interactive tools for processing code scan results in plain-text
|
||||
|
||||
License: GPLv3+
|
||||
URL: https://github.com/kdudka/csdiff
|
||||
Source0: https://github.com/kdudka/csdiff/releases/download/%{name}-%{version}/%{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/kdudka/csmock/commit/48b09b3a
|
||||
# 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
|
||||
%if 0%{?fedora} > 28
|
||||
BuildRequires: boost-python2-devel
|
||||
%endif
|
||||
BuildRequires: python2-devel
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
%py_provides python2-%{name}
|
||||
|
||||
%description -n python2-%{name}
|
||||
This package contains the Python 2 binding for the csdiff tool for comparing
|
||||
|
@ -54,9 +72,8 @@ 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
|
||||
BuildRequires: boost-python3-devel
|
||||
BuildRequires: python3-devel
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
%py_provides python3-%{name}
|
||||
|
||||
%description -n python3-%{name}
|
||||
This package contains the Python 3 binding for the csdiff tool for comparing
|
||||
|
@ -64,73 +81,115 @@ code scan defect lists to find out added or fixed defects.
|
|||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%{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
|
||||
%cmake -DBUILD_PYCSDIFF=OFF
|
||||
%cmake_build
|
||||
|
||||
%if %{with python2}
|
||||
%global _vpath_builddir %{_target_platform}-py2
|
||||
%cmake -DPYTHON_EXECUTABLE=%{__python2}
|
||||
%cmake_build
|
||||
%undefine _vpath_builddir
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%global _vpath_builddir %{_target_platform}-py3
|
||||
%cmake \
|
||||
-DPYTHON_EXECUTABLE=%{__python3} \
|
||||
-DBOOST_PYTHON_LIB_NAME=boost_python%{python3_version_nodots}
|
||||
%cmake_build --target pycsdiff
|
||||
%undefine _vpath_builddir
|
||||
%endif
|
||||
%cmake3 \
|
||||
-DPYCSDIFF_PYTHON2=%{?with_python2:ON} \
|
||||
-DPYCSDIFF_PYTHON3=%{?with_python3:ON}
|
||||
%cmake3_build
|
||||
|
||||
%install
|
||||
%if %{with python2}
|
||||
mkdir -vp %{buildroot}%{python2_sitearch}
|
||||
install -vm0644 %{_target_platform}-py2/pycsdiff.so %{buildroot}%{python2_sitearch}
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
mkdir -vp %{buildroot}%{python3_sitearch}
|
||||
install -vm0644 %{_target_platform}-py3/pycsdiff.so %{buildroot}%{python3_sitearch}
|
||||
%endif
|
||||
|
||||
%cmake_install
|
||||
%cmake3_install
|
||||
|
||||
%check
|
||||
%ctest
|
||||
%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*
|
||||
%{_mandir}/man1/cstrans-df-run.1*
|
||||
%doc COPYING README
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-%{name}
|
||||
%license COPYING
|
||||
%{python2_sitearch}/pycsdiff.so
|
||||
%doc COPYING
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%files -n python3-%{name}
|
||||
%license COPYING
|
||||
%{python3_sitearch}/pycsdiff.so
|
||||
%doc COPYING
|
||||
%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
|
||||
|
||||
|
|
|
@ -0,0 +1,52 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
lwvfpMesuQ==
|
||||
=XhUt
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
3
sources
3
sources
|
@ -1 +1,2 @@
|
|||
SHA512 (csdiff-1.9.0.tar.xz) = 046e439640938b86ca1e2197d5e99935d7461b3b4698ab71faa5c46190f2fff4bf8d570656cc47a2806218983d7b0dbec2a1cc0131c9d586af2f50b738ee005b
|
||||
SHA512 (csdiff-3.1.0.tar.xz) = 7dfd04a6a71bb2cb6e455efdb7f20dbee913e552995be1364d8fe0cc09e1ab182edf5d6bde0769430948b414d9acd5146ef2d3b5d2811def5c0c61e37857a878
|
||||
SHA512 (csdiff-3.1.0.tar.xz.asc) = e398949b4fbb3da9b2807d768b411d72ec7577af168381e86dceb49bb9694b406f1b22e626745a6776a32019864de326b91c6a9bed653b40c9e2969996f286fa
|
||||
|
|
Loading…
Reference in New Issue