don't try to run tests because there's no atf package since F21

This commit is contained in:
Jiri Popelka 2014-02-17 18:55:27 +01:00
parent 30308a134f
commit 683072b705

View File

@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.0 Version: 4.3.0
Release: 2%{?dist} Release: 3%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -87,11 +87,6 @@ BuildRequires: openldap-devel
BuildRequires: libcap-ng-devel BuildRequires: libcap-ng-devel
BuildRequires: bind-lite-devel >= 32:9.9.5-0.1.b1 BuildRequires: bind-lite-devel >= 32:9.9.5-0.1.b1
BuildRequires: systemd BuildRequires: systemd
%if 0%{?fedora}
# %%check
# there's no atf package in RHEL
BuildRequires: atf libatf-c-devel
%endif
%if %sdt %if %sdt
BuildRequires: systemtap-sdt-devel BuildRequires: systemtap-sdt-devel
%global tapsetdir /usr/share/systemtap/tapset %global tapsetdir /usr/share/systemtap/tapset
@ -384,18 +379,10 @@ CFLAGS="%{optflags} -fno-strict-aliasing" \
%if %sdt %if %sdt
--enable-systemtap \ --enable-systemtap \
--with-tapset-install-dir=%{tapsetdir} \ --with-tapset-install-dir=%{tapsetdir} \
%endif
%if 0%{?fedora}
--with-atf \
%endif %endif
--enable-paranoia --enable-early-chroot --enable-paranoia --enable-early-chroot
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
%if 0%{?fedora}
%check
%{__make} check
%endif
%install %install
%{__make} install DESTDIR=%{buildroot} %{__make} install DESTDIR=%{buildroot}
@ -613,6 +600,9 @@ done
%changelog %changelog
* Mon Feb 17 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-3
- don't try to run tests because there's no atf package since F21
* Mon Feb 17 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-2 * Mon Feb 17 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-2
- turn on using of DUID with DHCPv4 clients (#560361,c#40) - turn on using of DUID with DHCPv4 clients (#560361,c#40)
- remove default /etc/dhcp/dhclient.conf - remove default /etc/dhcp/dhclient.conf