diff --git a/cfengine.changes b/cfengine.changes index 70f50d7..0c3d3e3 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 2 07:14:21 UTC 2013 - kkaempf@suse.com + +- Fix SLE 11 build + Add remove-am_subst_notmake.patch + ------------------------------------------------------------------- Thu Jul 11 11:30:59 UTC 2013 - kkaempf@suse.com diff --git a/cfengine.spec b/cfengine.spec index 2420fa1..5b921f6 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -32,8 +32,11 @@ Version: 3.5.1 Release: 0 Url: http://www.cfengine.org/ Source: %{name}-%{version}.tar.gz -# there's no /usr/include/acl.h in SUSE +# there's no /usr/include/acl.h in SUSE, kkaempf@suse.de Patch1: libacl-headers.patch +# SLE 11 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de +Patch2: remove-am_subst_notmake.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 @@ -152,6 +155,9 @@ This package contains the files of the cfengine server. %setup -q -n %{name}-%{version} %if 0%{?suse_version} %patch1 -p1 +%if 0%{?suse_version} < 1120 +%patch2 -p1 +%endif %endif ##### rpmlint #### wrong-file-end-of-line-encoding diff --git a/remove-am_subst_notmake.patch b/remove-am_subst_notmake.patch new file mode 100644 index 0000000..699ab00 --- /dev/null +++ b/remove-am_subst_notmake.patch @@ -0,0 +1,11 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cfengine-3.5.1/configure.ac ./configure.ac +--- ../orig-cfengine-3.5.1/configure.ac 2013-07-11 10:26:03.000000000 +0200 ++++ ./configure.ac 2013-08-02 09:10:37.318396099 +0200 +@@ -1024,7 +1024,6 @@ + # Populate contents of config.post.h + # + AC_SUBST(post_macros) +-AM_SUBST_NOTMAKE(post_macros) + + dnl ###################################################################### + dnl Summarize