Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2013-08-10 12:11:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfengine" Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2013-07-18 17:31:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2013-08-10 12:11:53.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 2 07:14:21 UTC 2013 - kkae...@suse.com + +- Fix SLE 11 build + Add remove-am_subst_notmake.patch + +------------------------------------------------------------------- New: ---- remove-am_subst_notmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.mdpvsm/_old 2013-08-10 12:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.mdpvsm/_new 2013-08-10 12:11:54.000000000 +0200 @@ -32,8 +32,11 @@ 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 or Fedora, kkae...@suse.de Patch1: libacl-headers.patch +# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkae...@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 @@ -150,9 +153,16 @@ %prep %setup -q -n %{name}-%{version} -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel_version} %patch1 -p1 %endif +%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1110 +%patch2 -p1 +%endif +%if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 +%patch2 -p1 +%endif + ##### rpmlint #### wrong-file-end-of-line-encoding #### incorrect-fsf-address @@ -168,7 +178,6 @@ --enable-fhs \ --with-libxml2 \ --datadir=/var \ - --docdir=%{_docdir}/%{name} \ --with-workdir=%{workdir} \ --with-postgresql \ --with-pthreads \ @@ -176,7 +185,12 @@ --with-pcre \ --with-libvirt \ --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} # --datadir=/var/lib/%%{name}/inputs \ ++++++ remove-am_subst_notmake.patch ++++++ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
