update to latest upstream release (2.7.0)
This commit is contained in:
Kamil Dudka
parent
1915715d35
commit
a1995d3bd9
74
csdiff.spec
74
csdiff.spec
|
|
@ -1,3 +1,7 @@
|
|||
# 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
|
||||
|
|
@ -9,8 +13,8 @@
|
|||
%bcond_without python3
|
||||
|
||||
Name: csdiff
|
||||
Version: 2.6.0
|
||||
Release: 3%{?dist}
|
||||
Version: 2.7.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Non-interactive tools for processing code scan results in plain-text
|
||||
|
||||
License: GPLv3+
|
||||
|
|
@ -22,33 +26,30 @@ Source1: https://github.com/csutils/csdiff/releases/download/%{name}-%{versio
|
|||
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
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cmake3
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: help2man
|
||||
BuildRequires: make
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 8
|
||||
%if 0%{?rhel} && 0%{?rhel} < 9
|
||||
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}
|
||||
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
|
||||
|
|
@ -59,7 +60,7 @@ code scan defect lists to find out added or fixed defects.
|
|||
%package -n python3-%{name}
|
||||
Summary: Python interface to csdiff for Python 3
|
||||
|
||||
# this packages redefines %%{python3_pkgversion} to 36 because there is
|
||||
# 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
|
||||
|
|
@ -69,7 +70,7 @@ BuildRequires: epel-rpm-macros
|
|||
BuildRequires: boost-python%{python3_pkgversion}-devel
|
||||
%endif
|
||||
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
|
||||
|
|
@ -78,47 +79,24 @@ code scan defect lists to find out added or fixed defects.
|
|||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%setup -q
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
make version.cc
|
||||
mkdir -p %{_target_platform}
|
||||
cd %{_target_platform}
|
||||
%cmake .. -S.. -B. -DBUILD_PYCSDIFF=OFF
|
||||
%make_build
|
||||
|
||||
%if %{with python2}
|
||||
mkdir -p ../%{_target_platform}-py2
|
||||
cd ../%{_target_platform}-py2
|
||||
%cmake .. -S.. -B. -DPYTHON_EXECUTABLE=%{__python2}
|
||||
%make_build pycsdiff
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
mkdir -p ../%{_target_platform}-py3
|
||||
cd ../%{_target_platform}-py3
|
||||
%cmake .. -S.. -B. \
|
||||
-DPYTHON_EXECUTABLE=%{__python3} \
|
||||
-DBOOST_PYTHON_LIB_NAME=boost_python%{python3_version_nodots}
|
||||
%make_build pycsdiff
|
||||
%endif
|
||||
%cmake3 \
|
||||
-DPYCSDIFF_PYTHON2=%{?with_python2:ON} \
|
||||
-DPYCSDIFF_PYTHON3=%{?with_python3:ON}
|
||||
%cmake3_build
|
||||
|
||||
%install
|
||||
%if %{with python2}
|
||||
make install-pycsdiff -C %{_target_platform}-py2 DESTDIR=%{buildroot}
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
make install-pycsdiff -C %{_target_platform}-py3 DESTDIR=%{buildroot}
|
||||
%endif
|
||||
|
||||
%make_install -C %{_target_platform}
|
||||
%cmake3_install
|
||||
|
||||
%check
|
||||
cd %{_target_platform}
|
||||
ctest %{?_smp_mflags} --output-on-failure
|
||||
%ctest3
|
||||
|
||||
%files
|
||||
%doc README
|
||||
%license COPYING
|
||||
%{_bindir}/csdiff
|
||||
%{_bindir}/csgrep
|
||||
%{_bindir}/cshtml
|
||||
|
|
@ -132,21 +110,23 @@ ctest %{?_smp_mflags} --output-on-failure
|
|||
%{_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 Sep 06 2022 Kamil Dudka <kdudka@redhat.com> 2.7.0-1
|
||||
- update to latest upstream release
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (csdiff-2.6.0.tar.xz) = ac81e2dd619b60bba26cf4e775ebb2071821769c1d50f9eaa91cbd87b59422bdc3d56f21ca2704b4098305185e403c365068eb045f37080cd146f95a8d1afb0b
|
||||
SHA512 (csdiff-2.6.0.tar.xz.asc) = 0fbdfca611533bdf2ae4c7c80cbddc61e348ce9a154b1381c6514d6a51943742bc0f67e2b02c05bcc0f19352a37384e5ed8c82c6d3ee7ab602be5bb4f7063845
|
||||
SHA512 (csdiff-2.7.0.tar.xz) = d4c7c56fca0bc80bd15ef1d78493769f2d54a27fd6a8677487758a5ad86adfb201e4caac264365d089d802bad208f7255188586bba495ae3c8ed7bb0d8788d48
|
||||
SHA512 (csdiff-2.7.0.tar.xz.asc) = 5a1789060fdeeadf09abe608bc3c79b608edade8ef2fe9c6dea77a01bc6b16dd0124b6af492212cb7f52fa4d56db3695112b41d4f95d6d243dfeed9a08ffe92d
|
||||
|
|
|
|||
Loading…
Reference in New Issue