From 22a43eccc8294c19e0ec85cd053d61ccdecc5da5d04e7d8cc5a359e69533f91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Fri, 31 Mar 2017 07:43:07 +0000
Subject: [PATCH] - Update to 3.10.1   New features/additions:   - "make
 tar-package" should create a tarball with the contents of     "make install"
 (ENT-3041)

  Bugfixes:
  - Fix rare output truncation on Solaris 10/11 (CFE-2527)
  - Change: Don't error during dry run for proposed execution.
    (CFE-2561)
  - prevent LMDB assertion on AIX by ensuring nested DB calls are
    not occuring during signal handler cleanup (CFE-1996)
  - Detect Amazon Linux and set "AmazonLinux" hard class and
    sys.flavour variable.
  - Fix "lastseenexpireafter" 32-bit signed int overflow.
  - Add missing pcre build flags to cf-key (CFE-2525)
  - Fix a bug which could cause cf-execd to believe there was
    an error when sending the email report, when there really wasn't.
  - cf-serverd: Auto configure max open files ulimit according to
    maxconnections (CFE-2575)
  - Added vars and classes for CoreOS (ENT-3043)

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=156
---
 cfengine-3.10.0.tar.gz |  3 ---
 cfengine-3.10.1.tar.gz |  3 +++
 cfengine.changes       | 24 ++++++++++++++++++++++++
 cfengine.spec          | 14 +++++++-------
 4 files changed, 34 insertions(+), 10 deletions(-)
 delete mode 100644 cfengine-3.10.0.tar.gz
 create mode 100644 cfengine-3.10.1.tar.gz

diff --git a/cfengine-3.10.0.tar.gz b/cfengine-3.10.0.tar.gz
deleted file mode 100644
index 19ee4d0..0000000
--- a/cfengine-3.10.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8bf344eb6e9c06c0e12c1b23f5c793f43d43007826652e563cb9b2516742ecd5
-size 2352509
diff --git a/cfengine-3.10.1.tar.gz b/cfengine-3.10.1.tar.gz
new file mode 100644
index 0000000..44a3769
--- /dev/null
+++ b/cfengine-3.10.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0abb7e91d667a4f339b61e105dc66c583fa98e0217c6fc7fcf8a73300badca98
+size 2362381
diff --git a/cfengine.changes b/cfengine.changes
index ea25d6d..88bfc10 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Mar 31 06:06:41 UTC 2017 - kkaempf@suse.com
+
+- Update to 3.10.1
+  New features/additions:
+  - "make tar-package" should create a tarball with the contents of
+    "make install" (ENT-3041)
+  
+  Bugfixes:
+  - Fix rare output truncation on Solaris 10/11 (CFE-2527)
+  - Change: Don't error during dry run for proposed execution.
+    (CFE-2561)
+  - prevent LMDB assertion on AIX by ensuring nested DB calls are
+    not occuring during signal handler cleanup (CFE-1996)
+  - Detect Amazon Linux and set "AmazonLinux" hard class and
+    sys.flavour variable.
+  - Fix "lastseenexpireafter" 32-bit signed int overflow.
+  - Add missing pcre build flags to cf-key (CFE-2525)
+  - Fix a bug which could cause cf-execd to believe there was
+    an error when sending the email report, when there really wasn't.
+  - cf-serverd: Auto configure max open files ulimit according to
+    maxconnections (CFE-2575)
+  - Added vars and classes for CoreOS (ENT-3043)
+
 -------------------------------------------------------------------
 Thu Feb  2 04:29:47 UTC 2017 - bwiedemann@suse.com
 
diff --git a/cfengine.spec b/cfengine.spec
index 1bdf274..f371321 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define srcversion 3.10.0
+%define srcversion 3.10.1
 %define srcname %{name}-%{srcversion}
 %define libname   libpromises
 %define libsoname %{libname}3
@@ -71,6 +71,7 @@ Patch99:        remove-am_subst_notmake.patch
 
 BuildRequires:  bison
 BuildRequires:  db-devel
+BuildRequires:  fakeroot
 BuildRequires:  flex
 BuildRequires:  libacl-devel
 BuildRequires:  libtool
@@ -79,10 +80,8 @@ BuildRequires:  lmdb-devel >= 0.9.17
 BuildRequires:  openssl-devel >= 1.0.2e
 BuildRequires:  pam-devel
 BuildRequires:  pcre-devel >= 8.38
-%if 0%{?suse_version} == 0
-# for testing on RHEL/Fedora
-BuildRequires:  fakeroot
-%endif
+# for flock
+BuildRequires:  util-linux
 Requires:       %{libsoname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{have_systemd}
@@ -242,8 +241,7 @@ install -d %{buildroot}/{usr/sbin,%{workdir}/{bin,inputs,reports}}
 install -d %{buildroot}/%{basedir}/{backup,failsafe,config,plugins}
 
 %if %{have_systemd}
-# systemd: install sample cron file in docdir
-install -D -m0644 %{SOURCE10} %{buildroot}/%{_docdir}/%{name}
+cp %{SOURCE10} .
 %else
 # no systemd -> use cron
 # install cron file
@@ -360,6 +358,8 @@ fi
 %{_sbindir}/cf-runagent
 %{_sbindir}/rpmvercmp
 %if %{have_systemd}
+# systemd: install sample cron file in docdir
+%doc %{name}.cron
 %{_unitdir}/cf-execd.service
 %{_unitdir}/cf-monitord.service
 %{_unitdir}/cf-serverd.service