- explicitly enable postgres, pthreads, openssl, pcre, libvirt

and libacl
- add libacl-headers.patch to adapt to libacl-devel packaging

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=54

cfengine.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul  9 07:35:58 UTC 2013 - kkaempf@suse.com
+
+- explicitly enable postgres, pthreads, openssl, pcre, libvirt
+  and libacl
+
+- add libacl-headers.patch to adapt to libacl-devel packaging
+
 -------------------------------------------------------------------
 Thu Jun 13 06:54:57 UTC 2013 - kkaempf@suse.com
 

cfengine.spec

@@ -32,6 +32,8 @@ Version:        3.5.0
 Release:        0
 Url:            http://www.cfengine.org/
 Source:         %{name}-%{version}.tar.gz
+# there's no /usr/include/acl.h in SUSE
+Patch1:         libacl-headers.patch
 Source1:        http://www.cfengine.org/manuals/cf3-Reference.pdf
 Source2:        http://www.cfengine.org/manuals/cf3-conceptguide.pdf
 Source3:        http://www.cfengine.org/manuals/cf3-glossary.pdf
@@ -60,14 +62,18 @@ BuildRequires:  flex
 BuildRequires:  libtokyocabinet-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
+#
 # Disable mysql for SLE_11:
+#
 #   configure: error: MySQL client library exports symbols clashing with
 #   OpenSSL. Get the update from distribution provider, recompile MySQL
 #   library or disable MySQL connector. See
 #   http://bugs.mysql.com/bug.php?id=65055 for details.
+#
 %if 0%{?suse_version} != 1110
 BuildRequires:  mysql-devel
 %endif
+BuildRequires:  libacl-devel
 BuildRequires:  libvirt-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
@@ -144,6 +150,9 @@ This package contains the files of the cfengine server.
 
 %prep
 %setup -q -n %{name}-%{version}
+%if 0%{?suse_version}
+%patch1 -p1
+%endif
 ##### rpmlint
 #### wrong-file-end-of-line-encoding
 #### incorrect-fsf-address
@@ -152,6 +161,7 @@ find ./examples -type f -name "*.cf" -exec perl -p -i -e 's|\r\n|\n|,s|^# Founda
 
 %build
 autoreconf -fi
+# /usr/include/sys for acl.h
 CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 %configure \
   --disable-static \
@@ -159,7 +169,14 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
   --with-libxml2 \
   --datadir=/var \
   --docdir=%{_docdir}/%{name} \
-  --with-workdir=%{workdir}
+  --with-workdir=%{workdir} \
+  --with-postgresql \
+  --with-pthreads \
+  --with-openssl \
+  --with-pcre \
+  --with-libvirt \
+  --with-libacl \
+  --with-libxml2
 %{__make} %{?_smp_mflags}
 
 # --datadir=/var/lib/%%{name}/inputs \

libacl-headers.patch

@@ -0,0 +1,12 @@
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cfengine-3.5.0/configure.ac ./configure.ac
+--- ../orig-cfengine-3.5.0/configure.ac	2013-06-12 15:09:56.000000000 +0200
++++ ./configure.ac	2013-07-09 09:11:22.387724353 +0200
+@@ -350,7 +350,7 @@
+ if test "x$with_libacl" != xno; then
+   CF3_WITH_LIBRARY(libacl, [
+     AC_CHECK_LIB(acl, acl_init, [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library); fi])
+-    AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi])
++    AC_CHECK_HEADERS([sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi])
+   ])
+  fi
+