From 219fbac8e4f35a342505d2ef30020ed7f4547a109f9b25299a1ef8525444288a Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Fri, 21 Feb 2014 00:13:10 +0000 Subject: [PATCH] Accepting request 223319 from home:computersalat:devel:sysmgmnt fix build for SLES OBS-URL: https://build.opensuse.org/request/show/223319 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=74 --- cfengine-bootstrap.patch | 22 ++++++++++++++++ cfengine.changes | 18 ++++++++++++- cfengine.spec | 57 +++++++++++++++++++++------------------- libacl-headers.patch | 9 ++++--- 4 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 cfengine-bootstrap.patch diff --git a/cfengine-bootstrap.patch b/cfengine-bootstrap.patch new file mode 100644 index 0000000..7ee18fe --- /dev/null +++ b/cfengine-bootstrap.patch @@ -0,0 +1,22 @@ +Index: libpromises/bootstrap.c +=================================================================== +--- libpromises/bootstrap.c.orig ++++ libpromises/bootstrap.c +@@ -332,7 +332,7 @@ bool WriteBuiltinFailsafePolicyToPath(co + " handle => \"cfe_internal_bootstrap_update_files_sys_workdir_inputs_not_windows\",\n" + #ifdef __MINGW32__ + // This section is needed because Windows attempts to copy from "C:\Program Files\Cfengine\masterfiles". +- " copy_from => u_scp(\"/var/cfengine/masterfiles\"),\n" ++ " copy_from => u_scp(\"$(sys.workdir)/masterfiles\"),\n" + #else + " copy_from => u_scp(\"$(sys.masterdir)\"),\n" + #endif /* !__MINGW32__ */ +@@ -344,7 +344,7 @@ bool WriteBuiltinFailsafePolicyToPath(co + " handle => \"cfe_internal_bootstrap_update_files_sys_workdir_inputs_windows\",\n" + #ifdef __MINGW32__ + // This section is needed because Windows attempts to copy from "C:\Program Files\Cfengine\masterfiles". +- " copy_from => u_scp(\"/var/cfengine/masterfiles\"),\n" ++ " copy_from => u_scp(\"$(sys.workdir)/masterfiles\"),\n" + #else + " copy_from => u_scp(\"$(sys.masterdir)\"),\n" + #endif /* !__MINGW32__ */ diff --git a/cfengine.changes b/cfengine.changes index 05311b1..6696f1b 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Feb 20 23:54:22 UTC 2014 - chris@computersalat.de + +- merge with my last (not committed changes) + * bootstrap patch +- fix changes file + * update 3.0.4b2 -> 3.4.0b2 +- fix docs install +- fix build for SLE_11 (MySQL connector: disabled) + ------------------------------------------------------------------- Sun Feb 9 12:02:45 UTC 2014 - kkaempf@suse.com @@ -302,7 +312,7 @@ Thu Oct 4 08:48:10 UTC 2012 - kkaempf@suse.com - support systemd where applicable -- update to 3.0.4b2 +- update to 3.4.0b2 New features: - XML editing capabilities. See the documentation for edit_xml body. Note the new dependency: libxml2. @@ -341,6 +351,12 @@ Thu Oct 4 08:48:10 UTC 2012 - kkaempf@suse.com easier to run from systemd, launchd and other supervision systems. +------------------------------------------------------------------- +Wed Mar 7 13:02:30 UTC 2012 - chris@computersalat.de + +- add bootstrap patch + * set correct "workdir" + ------------------------------------------------------------------- Wed Feb 15 13:49:18 UTC 2012 - chris@computersalat.de diff --git a/cfengine.spec b/cfengine.spec index 8140f18..1336e0d 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -25,6 +25,9 @@ Name: cfengine # reported upstream as https://cfengine.com/dev/issues/1896 %define basedir /var/%{name} %define workdir %{basedir} +# This is the place where workdir should be +#define basedir /var/lib/%{name} +#define workdir %{basedir}/work Summary: CFEngine automates large-scale IT computing infrastructure License: GPL-3.0 @@ -34,17 +37,6 @@ Release: 0 Url: http://www.cfengine.org/ Source: %{name}-%{version}.tar.gz -# there's no /usr/include/acl.h in SUSE or Fedora, kkaempf@suse.de -Patch1: libacl-headers.patch -# SLE 11 or RHEL5 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 -Source4: http://www.cfengine.org/manuals/cf3-quickstart.pdf -Source5: http://www.cfengine.org/manuals/cf3-solutions.pdf -Source6: http://www.cfengine.org/manuals/cf3-tutorial.pdf # wtf? SLE_11 does not honor rpmlintrc %if 0%{?suse_version} <= 1130 BuildRequires: -post-build-checks @@ -61,7 +53,21 @@ Source9: cf-serverd Source10: %{name}.cron Source11: %{name}-rpmlintrc Source12: masterfiles-%{version}.tar.gz -Source13: http://www.verticalsysadmin.com/cfengine/primer.pdf +# docs +Source101: http://www.cfengine.org/manuals/cf3-Reference.pdf +Source102: http://www.cfengine.org/manuals/cf3-conceptguide.pdf +Source103: http://www.cfengine.org/manuals/cf3-glossary.pdf +Source104: http://www.cfengine.org/manuals/cf3-quickstart.pdf +Source105: http://www.cfengine.org/manuals/cf3-solutions.pdf +Source106: http://www.cfengine.org/manuals/cf3-tutorial.pdf +Source107: http://www.verticalsysadmin.com/cfengine/primer.pdf + +# FIX-4-UPSTREAM: fix workdir while bootstrapping +Patch0: %{name}-bootstrap.patch +# there's no /usr/include/acl.h in SUSE or Fedora, kkaempf@suse.de +Patch1: libacl-headers.patch +# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de +Patch2: remove-am_subst_notmake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison @@ -176,10 +182,11 @@ This package contains the files of the cfengine server. %prep %setup -q -n %{srcname}-%{version} +%patch0 %if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel_version} -%patch1 -p1 +%patch1 %endif -%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1110 +%if 0%{?suse_version} <= 1110 %patch2 -p1 %endif %if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 @@ -192,6 +199,10 @@ This package contains the files of the cfengine server. ### http://www.fsf.org/about/contact/ find ./examples -type f -name "*.cf" -exec perl -p -i -e 's|\r\n|\n|,s|^# Foundation.*|# Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA|' {} \; +### install extra docs +%{__install} -d docs +cp -a $RPM_SOURCE_DIR/*pdf docs/ + %build autoreconf -fi # /usr/include/sys for acl.h @@ -202,7 +213,9 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --datadir=/var \ --with-workdir=%{workdir} \ --with-postgresql \ +%if 0%{?suse_version} != 1110 --with-mysql \ +%endif --without-qdbm \ --without-tokyocabinet \ --with-lmdb \ @@ -257,10 +270,6 @@ sed -i\ %{buildroot}/etc/init.d/cf-* %{buildroot}/etc/cron.d/%{name} %endif -# install docs -%{__install} -d %{buildroot}/%{_docdir}/%{name} -%{__install} -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:13} %{buildroot}/%{_docdir}/%{name} - # create symlinks for sbin_PROGRAMS # because: cf-promises needs to be installed in /var/cfengine/work/bin for pre-validation of full configuration for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd; do @@ -392,11 +401,7 @@ fi %files %defattr(-,root,root) -%doc LICENSE -# %doc README -%doc ChangeLog -%exclude %{_docdir}/%{name}/examples -%exclude %{_docdir}/%{name}/*.pdf +%doc ChangeLog LICENSE README.md %{_sbindir}/cf-agent %{_sbindir}/cf-execd %{_sbindir}/cf-key @@ -445,13 +450,11 @@ fi %files doc %defattr(-,root,root) -%doc %{_docdir}/%{name}/*.pdf -%exclude %{_docdir}/%{name}/examples +%doc docs/*.pdf %files examples %defattr(-,root,root) -%dir %{_docdir}/%{name}/examples -%doc %{_docdir}/%{name}/examples +%doc examples/*cf %files server %defattr(-,root,root) diff --git a/libacl-headers.patch b/libacl-headers.patch index 49fd5af..a93f1c7 100644 --- a/libacl-headers.patch +++ b/libacl-headers.patch @@ -1,7 +1,8 @@ -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 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -396,7 +396,7 @@ AC_ARG_WITH([libacl], 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])