Accepting request 226604 from home:aeszter:branches:systemsmanagement
- fix build for RHEL * MySQL connector: disabled * docs go into versioned directory OBS-URL: https://build.opensuse.org/request/show/226604 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=75
This commit is contained in:
parent
219fbac8e4
commit
5bb1965c97
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 18 10:20:55 UTC 2014 - aeszter@gwdg.de
|
||||
|
||||
- fix build for RHEL
|
||||
* MySQL connector: disabled
|
||||
* docs go into versioned directory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 20 23:54:22 UTC 2014 - chris@computersalat.de
|
||||
|
||||
|
@ -85,7 +85,7 @@ BuildRequires: pam-devel
|
||||
# library or disable MySQL connector. See
|
||||
# http://bugs.mysql.com/bug.php?id=65055 for details.
|
||||
#
|
||||
%if 0%{?suse_version} != 1110
|
||||
%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0
|
||||
BuildRequires: mysql-devel
|
||||
%endif
|
||||
BuildRequires: libacl-devel
|
||||
@ -213,7 +213,7 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
||||
--datadir=/var \
|
||||
--with-workdir=%{workdir} \
|
||||
--with-postgresql \
|
||||
%if 0%{?suse_version} != 1110
|
||||
%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0
|
||||
--with-mysql \
|
||||
%endif
|
||||
--without-qdbm \
|
||||
@ -225,8 +225,10 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
||||
--with-libvirt \
|
||||
--with-libacl \
|
||||
--with-libxml2 \
|
||||
%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600
|
||||
%if 0%{?suse_version} >= 1110
|
||||
--docdir=%{_docdir}/%{name}
|
||||
%else if 0%{?rhel_version} >= 600
|
||||
--docdir=%{_docdir}/%{name}-%{version}
|
||||
%endif
|
||||
# SLE 10 and RHEL5 don't recognize --docdir
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user