spec file: do not include BuildRequires for lint by default

Lint is never executed from rpmbuild, so the BuildRequires for lint are
purely informational.

Include them only if %with_lint RPM macro is specified.

Update .travis.yml accordingly.

https://fedorahosted.org/freeipa/ticket/6418

Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Jan Cholasta 2016-10-12 13:27:16 +02:00 committed by David Kupka
parent 21395d1724
commit 1077743d90
3 changed files with 7 additions and 2 deletions

View File

@ -13,4 +13,4 @@ script:
- >
docker run -v $PWD:/freeipa -w /freeipa
martbab/freeipa-fedora-builder:${TRAVIS_BRANCH}-latest
/bin/bash -c 'dnf builddep -y --spec freeipa.spec.in && make rpms'
/bin/bash -c 'dnf builddep -y -D "with_lint 1" --spec freeipa.spec.in && make rpms'

View File

@ -7,7 +7,7 @@ For more information, see http://www.freeipa.org/page/Build
The quickest way to get the dependencies needed for building is:
# dnf builddep -b --spec freeipa.spec.in
# dnf builddep -b -D "with_lint 1" --spec freeipa.spec.in
or

View File

@ -8,6 +8,9 @@
%global with_python3 1
%endif
# lint is not executed during rpmbuild
# %global with_lint 1
%global alt_name ipa
%if 0%{?rhel}
%global samba_version 4.0.5-1
@ -108,6 +111,7 @@ BuildRequires: python-cffi
#
# Build dependencies for lint
#
%if 0%{?with_lint}
BuildRequires: samba-python
BuildRequires: pylint >= 1.0
# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1096506
@ -131,6 +135,7 @@ BuildRequires: python-sssdconfig
BuildRequires: python-nose
BuildRequires: python-paste
BuildRequires: systemd-python
%endif # with_lint
#
# Build dependencies for unit tests