From 4f00060aef7cea5fc20dec7447dd50dad20f4958 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Jan 02 2013 11:26:10 +0000 Subject: run %check in Fedora only, there's no atf package in RHEL --- diff --git a/dhcp.spec b/dhcp.spec index 030a93f..8d5f401 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -18,7 +18,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.2.5 -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # 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. @@ -85,8 +85,11 @@ BuildRequires: libtool BuildRequires: openldap-devel BuildRequires: libcap-ng-devel BuildRequires: bind-lite-devel +%if 0%{?fedora} # %%check +# there's no atf package in RHEL BuildRequires: atf libatf-c-devel +%endif %if %sdt BuildRequires: systemtap-sdt-devel %global tapsetdir /usr/share/systemtap/tapset @@ -370,12 +373,16 @@ CFLAGS="%{optflags} -fno-strict-aliasing" \ --enable-systemtap \ --with-tapset-install-dir=%{tapsetdir} \ %endif +%if 0%{?fedora} --with-atf \ +%endif --enable-paranoia --enable-early-chroot %{__make} %{?_smp_mflags} +%if 0%{?fedora} %check %{__make} check +%endif %install %{__make} install DESTDIR=%{buildroot} @@ -548,6 +555,9 @@ fi %changelog +* Wed Jan 02 2013 Jiri Popelka - 12:4.2.5-0.3.rc1 +- run %%check in Fedora only, there's no atf package in RHEL + * Thu Dec 20 2012 Jiri Popelka - 12:4.2.5-0.2.rc1 - don't package ancient contrib/* files