Fixed build for RHEL: no bash-completion

This commit is contained in:
Thomas Woerner 2012-09-04 16:29:11 +02:00
parent 4ba44299ba
commit d2202269e5

View File

@ -1,6 +1,6 @@
Name: rpmlint Name: rpmlint
Version: 1.4 Version: 1.4
Release: 8%{?dist} Release: 9%{?dist}
Summary: Tool for checking common errors in RPM packages Summary: Tool for checking common errors in RPM packages
Group: Development/Tools Group: Development/Tools
@ -21,7 +21,10 @@ BuildArch: noarch
BuildRequires: python >= 2.4 BuildRequires: python >= 2.4
BuildRequires: rpm-python >= 4.4 BuildRequires: rpm-python >= 4.4
BuildRequires: sed >= 3.95 BuildRequires: sed >= 3.95
%if ! 0%{?rhel}
# no bash-completion for RHEL
BuildRequires: bash-completion BuildRequires: bash-completion
%endif
Requires: rpm-python >= 4.4.2.2 Requires: rpm-python >= 4.4.2.2
Requires: python >= 2.4 Requires: python >= 2.4
%if ! 0%{?rhel} %if ! 0%{?rhel}
@ -69,6 +72,10 @@ pushd $RPM_BUILD_ROOT%{_bindir}
ln -s rpmlint el4-rpmlint ln -s rpmlint el4-rpmlint
ln -s rpmlint el5-rpmlint ln -s rpmlint el5-rpmlint
popd popd
%if 0%{?rhel}
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/
%endif
%check %check
make check make check
@ -80,8 +87,10 @@ make check
%if 0%{?fedora} >= 17 %if 0%{?fedora} >= 17
%{_datadir}/bash-completion/ %{_datadir}/bash-completion/
%else %else
%if ! 0%{?rhel}
%{_sysconfdir}/bash_completion.d/ %{_sysconfdir}/bash_completion.d/
%endif %endif
%endif
%{_bindir}/rpmdiff %{_bindir}/rpmdiff
%{_bindir}/el*-rpmlint %{_bindir}/el*-rpmlint
%{_bindir}/rpmlint %{_bindir}/rpmlint
@ -91,6 +100,9 @@ make check
%changelog %changelog
* Tue Sep 4 2012 Thomas Woerner <twoerner@redhat.com> - 1.4-9
- fix build for RHEL: no bash-completion
* Tue Aug 14 2012 Tom Callaway <spot@fedoraproject.org> - 1.4-8 * Tue Aug 14 2012 Tom Callaway <spot@fedoraproject.org> - 1.4-8
- add magic number fix for python 3 (bz845972) - add magic number fix for python 3 (bz845972)
- update license list - update license list