update to latest upstream release (1.7.0)

Resolves: #1705427 - make pycsdiff build with Python 3.8

csdiff-1.7.0.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEmSqW4HUFbnnNghT5hz2zdXKjezYFAl465N8ACgkQhz2zdXKj
+ezbkKw/9H78FgjIalE9Ji5kvG55lstKpwOE/R+Mqaplq7dkeKPZyjuEG+KZDdlOP
+YkZeMpOmbj/lWVfl01+LmFbag6Co7o7VW7RHwPiQsoc37+YubZ4co9VwfdAZ2Oak
+kMTiRFOu+k9zGLrxyY98JdSF7HcnPt4BtBbwhHTliQL99ojcpnDEMUz3e2ViE13R
+SeUm5YLuROfUCL3KweL/A9F+kh7yDTV1xdyM6YO7IQlPQ8SlWhCtzaruyRyhmkHr
+VBLj4rmjvzzeLH8qbZ+MmsXmv8PKu9a2S/+j5oWM4v8HoWDaPRrDZO7dVO9LbIBh
+u/36YjGRogwlGoU7GJSkRpOg4P+LAtmMzc9A5V9Xb2ThTUcGhw66FcxU01ZKehLI
+JqgyBLITfkY1srINBQcxdbgYiacJMMy1tYiNAujahVby/E1wKs9ztT72b/l9fG77
+4aQ9gmH9HCKcW0uer95zNne+XLmfQR4XXU1yn8Sjgn1LI7AMbnisUqh4L+V3WAKi
+qZsPwCn/nunOfCU5fGk6ZEDI1tbPP6UvV1vDRxcROt36mRkO/OH8TYzF9eyeAJ/M
+UcVQWSou27QhyuW1zdqalsgSDTjr/Q/JYNM/IjXRnqgHLtuF0+K7WHrQtn64zzRS
+nxUqcTnqqUWJ/pzJggN33UT0J0cMnjx08XBrVmqVNMmnkRxe6I0=
+=y232
+-----END PGP SIGNATURE-----

csdiff.spec

@@ -1,15 +1,29 @@
+# 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.0.8
+Version:    1.7.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/kdudka/csdiff
+Source0:    https://github.com/kdudka/csdiff/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
 
 BuildRequires: boost-devel
 BuildRequires: cmake
+BuildRequires: gcc-c++
 BuildRequires: help2man
 
 %description
@@ -17,18 +31,75 @@ 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}}
+
+%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.
+
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__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
+
+%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}}
+
+%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_*
 
 %build
 make version.cc
 mkdir csdiff_build
 cd csdiff_build
-%cmake ..
+%cmake .. -DBUILD_PYCSDIFF=OFF
 make %{?_smp_mflags} VERBOSE=yes
 
+%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_python%{python3_version_nodots}
+make %{?_smp_mflags} VERBOSE=yes pycsdiff
+%endif
+
 %install
+%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"
 
@@ -42,14 +113,87 @@ ctest %{?_smp_mflags} --output-on-failure
 %{_bindir}/cshtml
 %{_bindir}/cslinker
 %{_bindir}/cssort
+%{_bindir}/cstrans-df-run
 %{_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}
+%{python2_sitearch}/pycsdiff.so
+%doc COPYING
+%endif
+
+%if %{with python3}
+%files -n python3-%{name}
+%{python3_sitearch}/pycsdiff.so
+%doc COPYING
+%endif
+
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-c92e3489b0b9618981ed4d1e9eae2079  csdiff-1.0.8.tar.xz
+SHA512 (csdiff-1.7.0.tar.xz) = 8e457f290aa42ad7b4095e2d3e00fae569b385b8de9ed670c15fb938a0fe923c8dfbc580b0212cf8907eb34cc516a2269588e261d72287d6a994ccb5d5772372