run %check in Fedora only, there's no atf package in RHEL
This commit is contained in:
parent
b627731daa
commit
4f00060aef
12
dhcp.spec
12
dhcp.spec
@ -18,7 +18,7 @@
|
|||||||
Summary: Dynamic host configuration protocol software
|
Summary: Dynamic host configuration protocol software
|
||||||
Name: dhcp
|
Name: dhcp
|
||||||
Version: 4.2.5
|
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
|
# 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.
|
||||||
@ -85,8 +85,11 @@ BuildRequires: libtool
|
|||||||
BuildRequires: openldap-devel
|
BuildRequires: openldap-devel
|
||||||
BuildRequires: libcap-ng-devel
|
BuildRequires: libcap-ng-devel
|
||||||
BuildRequires: bind-lite-devel
|
BuildRequires: bind-lite-devel
|
||||||
|
%if 0%{?fedora}
|
||||||
# %%check
|
# %%check
|
||||||
|
# there's no atf package in RHEL
|
||||||
BuildRequires: atf libatf-c-devel
|
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
|
||||||
@ -370,12 +373,16 @@ CFLAGS="%{optflags} -fno-strict-aliasing" \
|
|||||||
--enable-systemtap \
|
--enable-systemtap \
|
||||||
--with-tapset-install-dir=%{tapsetdir} \
|
--with-tapset-install-dir=%{tapsetdir} \
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?fedora}
|
||||||
--with-atf \
|
--with-atf \
|
||||||
|
%endif
|
||||||
--enable-paranoia --enable-early-chroot
|
--enable-paranoia --enable-early-chroot
|
||||||
%{__make} %{?_smp_mflags}
|
%{__make} %{?_smp_mflags}
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
%check
|
%check
|
||||||
%{__make} check
|
%{__make} check
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{__make} install DESTDIR=%{buildroot}
|
%{__make} install DESTDIR=%{buildroot}
|
||||||
@ -548,6 +555,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 02 2013 Jiri Popelka <jpopelka@redhat.com> - 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 <jpopelka@redhat.com> - 12:4.2.5-0.2.rc1
|
* Thu Dec 20 2012 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-0.2.rc1
|
||||||
- don't package ancient contrib/* files
|
- don't package ancient contrib/* files
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user