update to latest upstream release
... and make both python2 and python3 optional
This commit is contained in:
parent
b9a89b98a0
commit
3c4259c661
|
@ -1,16 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAlpc9JMACgkQhz2zdXKj
|
||||
ezaa8Q/9GqlQowhHJ2jpT5d/7lbHSzNXVa/mbHD3/HOGTsU3qmlq8ugVwCAZGpLP
|
||||
rGq9vLvRevpr2H6kwMVydbjwy5kvRJo9t1iAqytEYpTcL4rpEddVUymXNyJnBIoY
|
||||
krrmEdIkgvFYqpfB5UR0NcUzPBC16yAorTZ4fYegJVVQUbCvvDuRDv+EX9cXXLTt
|
||||
yG11nCkzYlz336WvNZBXk+dZdAa6G+BVhpXieILQGx4z8K+FaHg8h/DbobOsejxK
|
||||
DlyQoiL8jBD+DZZi7PVWpOhWu2WxfJ5sSOLQSn8V0Dm9tYnb1fNq8hB4KnMWuDyf
|
||||
9ldIoC90GNgrQ3ej8nu9mYcUjhAMyykfPNp1IfdcpaybJVpNbzVjQmQmdBnNG64Y
|
||||
Yqd9X9+iNNCX3CJYmQpBsDIZtzxDwcpGrkIfuxaDJ6/0nKb3w5X8ZLweyNcWxhzZ
|
||||
0LrdZhr+9WOSK0C3Jx5Zgh42VqoQb/QeAX8uyW+7g5FxrYIeL3WQSf/OYge04Fqo
|
||||
4fGtHS7luADwYJbL42mnClbzWNry9RkqXmG9ah7ytFMamqIQafHJ3rRT4k6JeGWZ
|
||||
b1UGIUeE1UXDe/OZz1HgTpOSxPxpyta1N3VqUDwvEuDh35UM8MFJ8lTVeu45TPVH
|
||||
nFB3ADPitGnvvZ0c6uHAFYQfmOIh7bSF2zbCyyg0n+yf5PsXi7s=
|
||||
=M7h2
|
||||
-----END PGP SIGNATURE-----
|
|
@ -0,0 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAlrrIGcACgkQhz2zdXKj
|
||||
ezai0hAAoPAQDxWegDFClsI7RpENlujDkbyST0Ox0834ZIz5DoEZvenDx0Z3SN1D
|
||||
dmmf4m5FGuIL2hsfDhm17XsfaTToFzZtjTvCUWxGKmWOLUfEcsmbtoSLGS0D/sVD
|
||||
PDT5OPQiokuUIjGs9m2v8yxDvwSEQHNPbq80mxUJBN/qbD0N+Np5GCBPdOOPp6d7
|
||||
Ckv1ZhGT7FC2A49CKoMNy/Kr6iQWLu4uf2u5hZlZYg6c9yQFU9gu512ACJo2aS+v
|
||||
Tpkzl/0IYWZnHyC8/N8rlLhekfK3DldH1C6mccmZjIjQEO3bn/YoDYUxJWUuPSAs
|
||||
p3I0ONidu67hiubvhVAY4yF0/BFH84XUt4f9FpTlr0wu6ODcLOh8Tfi5KFPj4D3M
|
||||
485UUpbkHpXFs/6Us1ubLigbZkvS58i2wDDnILoQnBTi9u2dYpjiMVonh7lvW/LV
|
||||
ppXiqFf+PGeBlHl+FRgc9Dn0QExXAX6LywPSx0jS9m29TQu28/YdQzZG0FinoOqu
|
||||
soYJAu7SxHcZjGM/U6DGgS5l3rija1A2xnW83zznlWbpLBue6Pmi0nP7Fsg0gVNe
|
||||
sfK5uKBfPv/TRRzwIJ1kQFB0zWQ0BAPBAw5A2+vxkdGnbSBqNPoCRKaiVNULhJ2h
|
||||
UbeYfVP/061iURGNF2qPoj6eG+Jla7rBy3PcmMUL//Lp37F6Y74=
|
||||
=ejFS
|
||||
-----END PGP SIGNATURE-----
|
55
csdiff.spec
55
csdiff.spec
|
@ -1,6 +1,20 @@
|
|||
# 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
|
||||
%bcond_with python2
|
||||
%else
|
||||
%bcond_without python2
|
||||
%endif
|
||||
|
||||
Name: csdiff
|
||||
Version: 1.3.3
|
||||
Release: 4%{?dist}
|
||||
Version: 1.4.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Non-interactive tools for processing code scan results in plain-text
|
||||
|
||||
Group: Applications/Text
|
||||
|
@ -18,9 +32,13 @@ 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.
|
||||
|
||||
%if %{with python2}
|
||||
%package -n python2-%{name}
|
||||
Summary: Python interface to csdiff for Python 2
|
||||
Conflicts: %{name} <= 1.2.3
|
||||
%if 0%{?fedora} > 28
|
||||
BuildRequires: boost-python2-devel
|
||||
%endif
|
||||
BuildRequires: python2-devel
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
|
||||
|
@ -32,10 +50,9 @@ code scan defect lists to find out added or fixed defects.
|
|||
%{!?__python2: %global __python2 /usr/bin/python2}
|
||||
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# build the python3-csdiff package on Fedora 23+
|
||||
%global py3_support ((7 < 0%{?rhel}) || (22 < 0%{?fedora}))
|
||||
%if %{py3_support}
|
||||
%if %{with python3}
|
||||
%package -n python3-%{name}
|
||||
Summary: Python interface to csdiff for Python 3
|
||||
BuildRequires: boost-python3-devel
|
||||
|
@ -54,11 +71,17 @@ code scan defect lists to find out added or fixed defects.
|
|||
make version.cc
|
||||
mkdir csdiff_build
|
||||
cd csdiff_build
|
||||
%cmake .. -DPYTHON_EXECUTABLE=%{__python2}
|
||||
%cmake .. -DBUILD_PYCSDIFF=OFF
|
||||
make %{?_smp_mflags} VERBOSE=yes
|
||||
|
||||
# build the python3-csdiff package on Fedora 23+
|
||||
%if %{py3_support}
|
||||
%if %{with python2}
|
||||
mkdir ../csdiff_build_py2
|
||||
cd ../csdiff_build_py2
|
||||
%cmake .. -DPYTHON_EXECUTABLE=%{__python2}
|
||||
make %{?_smp_mflags} VERBOSE=yes
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
mkdir ../csdiff_build_py3
|
||||
cd ../csdiff_build_py3
|
||||
%cmake .. -DPYTHON_EXECUTABLE=%{__python3} -DBOOST_PYTHON_LIB_NAME=boost_python3
|
||||
|
@ -66,10 +89,16 @@ make %{?_smp_mflags} VERBOSE=yes pycsdiff
|
|||
%endif
|
||||
|
||||
%install
|
||||
%if %{py3_support}
|
||||
%if %{with python2}
|
||||
mkdir -vp %{buildroot}%{python2_sitearch}
|
||||
install -vm0644 csdiff_build_py2/pycsdiff.so %{buildroot}%{python2_sitearch}
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
mkdir -vp %{buildroot}%{python3_sitearch}
|
||||
install -vm0644 csdiff_build_py3/pycsdiff.so %{buildroot}%{python3_sitearch}
|
||||
%endif
|
||||
|
||||
cd csdiff_build
|
||||
make install DESTDIR="$RPM_BUILD_ROOT"
|
||||
|
||||
|
@ -90,17 +119,23 @@ ctest %{?_smp_mflags} --output-on-failure
|
|||
%{_mandir}/man1/cssort.1*
|
||||
%doc COPYING README
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-%{name}
|
||||
%{python2_sitearch}/pycsdiff.so
|
||||
%doc COPYING
|
||||
%endif
|
||||
|
||||
%if %{py3_support}
|
||||
%if %{with python3}
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitearch}/pycsdiff.so
|
||||
%doc COPYING
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (csdiff-1.3.3.tar.xz) = 1d879766e794d3e54099d4ce55cb5f4cffcdd29aaeea5da13c4a94737ca6387ca9262aa8bfcad0aa6d3a9c95075f95db10241359f8856b3826c46ad93a6c08c0
|
||||
SHA512 (csdiff-1.4.0.tar.xz) = e0194bf6891aa9387d2b5ab547b656717ece4eff54f50b129232ee781652076c988b15b306b9328ca145de9992fd442ab65c5c8a75f13cb303a67bcacc1d1a7a
|
||||
|
|
Loading…
Reference in New Issue