rpms
/
csdiff
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to latest upstream release (2.0.0)

This commit is contained in:
Kamil Dudka 2021-01-08 09:29:06 +01:00
parent d43c34c40e
commit 821ec93359
4 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
csdiff-1.9.0.tar.xz.asc
View File

@ -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-----

16
csdiff-2.0.0.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAl/4Fo4ACgkQhz2zdXKj
ezbBrg/8CdSWU314mpuuYar9lHv2A1NnuH47RPeOVMK7e4lyZS5bI/RPTwxjYrtz
Cno4aexYAlEppVDyHIpVLwx74UMat5fo05WKxNp1jAqIXCr+E+5sEC1XtXRyrAQY
NjGDIx1h74ar7T0LlxBotDVNihxbVmpI+A0iu47+rBONJMcwuIHzC2+J3eNpouGA
jWf341I+5In59K0LVw9GCqnaYJ3beJ+ts/E4DT1I0g+wNozBY2lXMiyjcQiJtx0b
viF6epwGjme0qcS7Hf2SfvOLnZ0ofFa0cdDMjBNyuk9t6w2e1hzuLKk+ZH2OZwBT
zdcWKkjGGQJUfmXEYilZOEkIVek/Lrh7GTvNMZLbP9uteOAdg0wNLkj9mPyliEm+
K0GV5zH3sdeVyixu7QzItf6zgG7TdxriMaNDh2vp3nLbe8MHNG+RIy6gz/Wx4bgz
DNs3gaJnF9G8eF6BhBBb7YDH9VEbK3Vh0GywiCe4dS4EdkzU3iRJ8PC3tozHCf+W
k2fMT3TbG6p7HLXSJKgkazt19BHD2ugueRAV2i81szFi7OxcuNZJjOjKX4IB9H1+
vzZvbH4URHEYIrlhv5ZBJy0T1VxWNGg3h93XFMBFnap3D2fCNcQc8CSYWh0iYAhh
k5+GFktO8OZZzWM58AKgOlDllf9/ZPFGoZzocQl75wH2m4Qwkf4=
=XBdJ
-----END PGP SIGNATURE-----

65
csdiff.spec
View File

@ -1,21 +1,15 @@
%undefine __cmake_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: 2.0.0
Release: 1%{?dist}
Summary: Non-interactive tools for processing code scan results in plain-text
@ -40,7 +34,7 @@ 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
%if 0%{?fedora}
BuildRequires: boost-python2-devel
%endif
BuildRequires: python2-devel
@ -54,7 +48,13 @@ 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
# this packages 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
BuildRequires: boost-python%{python3_pkgversion}-devel
BuildRequires: python3-devel
%{?python_provide:%python_provide python3-%{name}}
@ -68,40 +68,41 @@ code scan defect lists to find out added or fixed defects.
%build
make version.cc
%cmake -DBUILD_PYCSDIFF=OFF
%cmake_build
mkdir -p %{_target_platform}
cd %{_target_platform}
%cmake .. -B. -DBUILD_PYCSDIFF=OFF
%make_build
%if %{with python2}
%global _vpath_builddir %{_target_platform}-py2
%cmake -DPYTHON_EXECUTABLE=%{__python2}
%cmake_build
%undefine _vpath_builddir
mkdir -p ../%{_target_platform}-py2
cd ../%{_target_platform}-py2
%cmake .. -B. -DPYTHON_EXECUTABLE=%{__python2}
%make_build pycsdiff
%endif
%if %{with python3}
%global _vpath_builddir %{_target_platform}-py3
%cmake \
mkdir -p ../%{_target_platform}-py3
cd ../%{_target_platform}-py3
%cmake .. -B. \
-DPYTHON_EXECUTABLE=%{__python3} \
-DBOOST_PYTHON_LIB_NAME=boost_python%{python3_version_nodots}
%cmake_build --target pycsdiff
%undefine _vpath_builddir
%make_build pycsdiff
%endif
%install
%if %{with python2}
mkdir -vp %{buildroot}%{python2_sitearch}
install -vm0644 %{_target_platform}-py2/pycsdiff.so %{buildroot}%{python2_sitearch}
make install-pycsdiff -C %{_target_platform}-py2 DESTDIR=%{buildroot}
%endif
%if %{with python3}
mkdir -vp %{buildroot}%{python3_sitearch}
install -vm0644 %{_target_platform}-py3/pycsdiff.so %{buildroot}%{python3_sitearch}
make install-pycsdiff -C %{_target_platform}-py3 DESTDIR=%{buildroot}
%endif
%cmake_install
%make_install -C %{_target_platform}
%check
%ctest
cd %{_target_platform}
ctest %{?_smp_mflags} --output-on-failure
%files
%{_bindir}/csdiff
@ -110,6 +111,7 @@ install -vm0644 %{_target_platform}-py3/pycsdiff.so %{buildroot}%{python3_sitear
%{_bindir}/cslinker
%{_bindir}/cssort
%{_bindir}/cstrans-df-run
%{_datadir}/%{name}
%{_mandir}/man1/csdiff.1*
%{_mandir}/man1/csgrep.1*
%{_mandir}/man1/cshtml.1*
@ -131,6 +133,9 @@ install -vm0644 %{_target_platform}-py3/pycsdiff.so %{buildroot}%{python3_sitear
%endif
%changelog
* 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

2
sources
View File

@ -1 +1 @@
SHA512 (csdiff-1.9.0.tar.xz) = 046e439640938b86ca1e2197d5e99935d7461b3b4698ab71faa5c46190f2fff4bf8d570656cc47a2806218983d7b0dbec2a1cc0131c9d586af2f50b738ee005b
SHA512 (csdiff-2.0.0.tar.xz) = 49404e0304cc1fa57b23aa002f48c85b93074ec02786349822c8592442d8bc9e38d416ab3ede92360a1adf9f0cf49e4350f29fd9b56fe87c861425255c4dd4b9