pool/cfengine
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 226604 from home:aeszter:branches:systemsmanagement

Browse Source 
- 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:
Klaus Kämpf 2014-03-19 14:06:37 +00:00 committed by Git OBS Bridge
parent 219fbac8e4
commit 5bb1965c97
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cfengine.changes
View File

@ -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 Thu Feb 20 23:54:22 UTC 2014 - chris@computersalat.de

8
cfengine.spec
View File

@ -85,7 +85,7 @@ BuildRequires: pam-devel
# library or disable MySQL connector. See # library or disable MySQL connector. See
# http://bugs.mysql.com/bug.php?id=65055 for details. # 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 BuildRequires: mysql-devel
%endif %endif
BuildRequires: libacl-devel BuildRequires: libacl-devel
@ -213,7 +213,7 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--datadir=/var \ --datadir=/var \
--with-workdir=%{workdir} \ --with-workdir=%{workdir} \
--with-postgresql \ --with-postgresql \
%if 0%{?suse_version} != 1110 %if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0
--with-mysql \ --with-mysql \
%endif %endif
--without-qdbm \ --without-qdbm \
@ -225,8 +225,10 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--with-libvirt \ --with-libvirt \
--with-libacl \ --with-libacl \
--with-libxml2 \ --with-libxml2 \
%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600 %if 0%{?suse_version} >= 1110
--docdir=%{_docdir}/%{name} --docdir=%{_docdir}/%{name}
%else if 0%{?rhel_version} >= 600
--docdir=%{_docdir}/%{name}-%{version}
%endif %endif
# SLE 10 and RHEL5 don't recognize --docdir # SLE 10 and RHEL5 don't recognize --docdir