From bb971355cb19dc71db2a9bc7c2614cb6bfffb1a20cb16474f643fe38e65bc27c Mon Sep 17 00:00:00 2001
From: Bin Liu <bliu@suse.com>
Date: Wed, 16 Aug 2017 06:29:09 +0000
Subject: [PATCH] Accepting request 517123 from
 home:BinLiu:branches:network:ha-clustering:Factory

- Fix rpmlint warnings
    Added: 0011-fix-tmpfiles-create.patch

OBS-URL: https://build.opensuse.org/request/show/517123
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=100
---
 0011-fix-tmpfiles-create.patch |  9 +++++++++
 corosync.changes               |  3 +++
 corosync.spec                  | 11 +++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 0011-fix-tmpfiles-create.patch

diff --git a/0011-fix-tmpfiles-create.patch b/0011-fix-tmpfiles-create.patch
new file mode 100644
index 0000000..db8b2d9
--- /dev/null
+++ b/0011-fix-tmpfiles-create.patch
@@ -0,0 +1,9 @@
+--- corosync-2.4.2.orig/tools/corosync-notifyd.sysconfig.example    2016-11-08 00:39:12.000000000 +0800
++++ corosync-2.4.2/tools/corosync-notifyd.sysconfig.example 2017-08-16 11:41:00.485913615 +0800
+@@ -6,5 +6,4 @@
+ #
+ 
+ # Send DBUS signals on all events (for SNMP traps, use -s)
+-OPTIONS="-d"
+-
++# OPTIONS="-d"
diff --git a/corosync.changes b/corosync.changes
index 0599140..8e75b22 100644
--- a/corosync.changes
+++ b/corosync.changes
@@ -9,6 +9,9 @@ Thu Aug  3 02:50:00 UTC 2017 - bliu@suse.com
 - L3: corosync: assert(sender_node != NULL) fails after tearing down a network interface(bsc#1032634)
     Added: 0010-fix-ifdown-udp.patch 
 
+- Fix rpmlint warnings
+    Added: 0011-fix-tmpfiles-create.patch
+
 -------------------------------------------------------------------
 Thu Aug  3 02:49:21 UTC 2017 - bliu@suse.com
 
diff --git a/corosync.spec b/corosync.spec
index 25915e6..c7cff13 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -32,6 +32,11 @@
 %bcond_without qdevices
 %bcond_without qnetd
 
+%if %{defined tmpfiles_create}
+%else
+%define tmpfiles_create systemd-tmpfiles --create
+%endif
+
 %if 0%{?sles_version} == 12
 %ifnarch s390 s390x
 %define buildib 1
@@ -70,6 +75,7 @@ Patch17:        0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
 Patch18:        0008-main.c-add-option-to-set-priority.patch
 Patch19:        0009-totem-Propagate-totem-initialization-failure.patch
 Patch20:        0010-fix-ifdown-udp.patch
+Patch21:        0011-fix-tmpfiles-create.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -148,6 +154,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 %if %{with runautogen}
@@ -269,7 +276,7 @@ APIs and libraries, default configuration files, and an init script.
 %service_add_pre corosync.service corosync-notifyd.service
 
 %post
-#%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd
+%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd
 %{fillup_and_insserv -n corosync}
 %service_add_post corosync.service corosync-notifyd.service
 
@@ -545,7 +552,7 @@ getent passwd coroqnetd >/dev/null || useradd -r -g coroqnetd -u 701 -s /sbin/no
 exit 0
 
 %post -n corosync-qnetd
-#%tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf
+%tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf
 %if %{sles_version} > 0
 ln -s /run/corosync-qnetd /var/run/
 %endif