fix Fedora and RHEL builds

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=58
This commit is contained in:
Klaus Kämpf 2013-08-02 08:46:05 +00:00 committed by Git OBS Bridge
parent bb106502f7
commit 542ac7fe91

View File

@ -32,9 +32,9 @@ Version: 3.5.1
Release: 0 Release: 0
Url: http://www.cfengine.org/ Url: http://www.cfengine.org/
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
# there's no /usr/include/acl.h in SUSE, kkaempf@suse.de # there's no /usr/include/acl.h in SUSE or Fedora, kkaempf@suse.de
Patch1: libacl-headers.patch Patch1: libacl-headers.patch
# SLE 11 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
Patch2: remove-am_subst_notmake.patch Patch2: remove-am_subst_notmake.patch
Source1: http://www.cfengine.org/manuals/cf3-Reference.pdf Source1: http://www.cfengine.org/manuals/cf3-Reference.pdf
@ -153,12 +153,16 @@ This package contains the files of the cfengine server.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%if 0%{?suse_version} %if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel_version}
%patch1 -p1 %patch1 -p1
%if 0%{?suse_version} < 1120 %endif
%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1110
%patch2 -p1 %patch2 -p1
%endif %endif
%if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600
%patch2 -p1
%endif %endif
##### rpmlint ##### rpmlint
#### wrong-file-end-of-line-encoding #### wrong-file-end-of-line-encoding
#### incorrect-fsf-address #### incorrect-fsf-address
@ -174,7 +178,6 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--enable-fhs \ --enable-fhs \
--with-libxml2 \ --with-libxml2 \
--datadir=/var \ --datadir=/var \
--docdir=%{_docdir}/%{name} \
--with-workdir=%{workdir} \ --with-workdir=%{workdir} \
--with-postgresql \ --with-postgresql \
--with-pthreads \ --with-pthreads \
@ -182,7 +185,12 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--with-pcre \ --with-pcre \
--with-libvirt \ --with-libvirt \
--with-libacl \ --with-libacl \
--with-libxml2 --with-libxml2 \
%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600
--docdir=%{_docdir}/%{name}
%endif
# SLE 10 and RHEL5 don't recognize --docdir
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
# --datadir=/var/lib/%%{name}/inputs \ # --datadir=/var/lib/%%{name}/inputs \