Disable using of Python 2

This commit is contained in:
Jitka Plesnikova 2018-06-22 16:56:24 +02:00
parent 54392e7afe
commit 34dd3b20b7

View File

@ -7,6 +7,7 @@
# Disable PHP tests, because they fail with PHP 7.2.0 # Disable PHP tests, because they fail with PHP 7.2.0
%{!?phplang:%global phplang 0} %{!?phplang:%global phplang 0}
%{!?rubylang:%global rubylang 1} %{!?rubylang:%global rubylang 1}
%{!?python2lang:%global python2lang 0}
%if 0%{?rhel} %if 0%{?rhel}
%{!?golang:%global golang 0} %{!?golang:%global golang 0}
@ -33,7 +34,7 @@
Summary: Connects C/C++/Objective C to some high-level programming languages Summary: Connects C/C++/Objective C to some high-level programming languages
Name: swig Name: swig
Version: 3.0.12 Version: 3.0.12
Release: 17%{?dist} Release: 18%{?dist}
License: GPLv3+ and BSD License: GPLv3+ and BSD
URL: http://swig.sourceforge.net/ URL: http://swig.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
@ -62,7 +63,10 @@ Patch9: swig-3.0.12-Coverity-fix-issue-reported-for-wrapper-argument-che.patch
Patch10: swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_ConvertF.patch Patch10: swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_ConvertF.patch
BuildRequires: perl-interpreter, pcre-devel BuildRequires: perl-interpreter, pcre-devel
BuildRequires: python2-devel, python3-devel %if %{python2lang}
BuildRequires: python2-devel
%endif
BuildRequires: python3-devel
BuildRequires: autoconf, automake, gawk, dos2unix BuildRequires: autoconf, automake, gawk, dos2unix
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: help2man BuildRequires: help2man
@ -180,6 +184,12 @@ done
# It causes that log had more then 600M. # It causes that log had more then 600M.
%configure \ %configure \
--without-ocaml \ --without-ocaml \
%if %{python2lang}
--with-python=%__python2\
%else
--without-python \
%endif
--with-python3=%__python3 \
%if %{phplang} %if %{phplang}
--with-php=%{__php} \ --with-php=%{__php} \
%endif %endif
@ -322,6 +332,9 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb
%{_datadir}/%{name}/gdb %{_datadir}/%{name}/gdb
%changelog %changelog
* Fri Jun 22 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-18
- Disable using of Python 2
* Tue Apr 24 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-17 * Tue Apr 24 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.12-17
- Backport upstream Coverity fixes (bug#1570037) - Backport upstream Coverity fixes (bug#1570037)
- Do not build ccache-swig on RHEL - Do not build ccache-swig on RHEL