From 1c57e40e9177f1cc12d39ae0ff836b3201c71f39 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mar 15 2019 10:53:46 +0000
Subject: - systemd-tmpfiles: change path to /run/resource-agents


  Resolves: rhbz#1688865

---

diff --git a/resource-agents.spec b/resource-agents.spec
index a708da6..999d930 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -52,7 +52,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.2.0
-Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
+Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -199,6 +199,7 @@ export CFLAGS
 %endif
 %if %{defined _tmpfilesdir}
     --with-systemdtmpfilesdir=%{_tmpfilesdir} \
+    --with-rsctmpdir=/run/resource-agents \
 %endif
 	--with-pkg-name=%{name} \
 	--with-ras-set=%{rasset}
@@ -279,7 +280,11 @@ test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin
 
 %{_includedir}/heartbeat
 
+%if %{defined _tmpfilesdir}
+%dir %attr (1755, root, root)	/run/resource-agents
+%else
 %dir %attr (1755, root, root)	%{_var}/run/resource-agents
+%endif
 
 %{_mandir}/man7/*.7*
 %{_mandir}/man8/ocf-tester.8*
@@ -348,6 +353,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Fri Mar 15 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.0-2
+- systemd-tmpfiles: change path to /run/resource-agents
+
+  Resolves: rhbz#1688865
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild