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