rpms/resource-agents
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Restores rsctmp directory to upstream default

Browse Source
This commit is contained in:
David Vossel 2013-06-18 16:55:45 -05:00
parent ce546be6ad
commit 8b70287fea
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resource-agents.spec
View File

@ -36,7 +36,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 3.9.5
Release: 5
Release: 6
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@ -156,8 +156,6 @@ fi
%if 0%{?fedora} >= 11 || 0%{?centos_version} > 5 || 0%{?rhel} > 5
CFLAGS="$(echo '%{optflags}')"
# TODO make this rsctmp folder the same as upstream
%global conf_opt_rsctmpdir "--with-rsctmpdir=%{_var}/run/heartbeat/rsctmp"
%global conf_opt_fatal "--enable-fatal-warnings=no"
%else
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
@ -177,7 +175,6 @@ CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export CFLAGS
%configure \
%{?conf_opt_rsctmpdir:%conf_opt_rsctmpdir} \
%{conf_opt_fatal} \
--with-pkg-name=%{name} \
--with-ras-set=%{rasset}
@ -250,12 +247,7 @@ rm -rf %{buildroot}
%{_includedir}/heartbeat
# TODO make this rsctmp folder the same as upstream
%if 0%{?fedora} >= 11 || 0%{?centos_version} > 5 || 0%{?rhel} > 5
%dir %{_var}/run/heartbeat/rsctmp
%else
%dir %attr (1755, root, root) %{_var}/run/resource-agents
%endif
%{_mandir}/man7/*.7*
%{_mandir}/man8/ocf-tester.8*
@ -308,6 +300,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
%endif
%changelog
* Tue Jun 18 2013 David Vossel <dvossel@redhat.com> - 3.9.5-6
- Restores rsctmp directory to upstream default.
* Tue Jun 18 2013 David Vossel <dvossel@redhat.com> - 3.9.5-5
- Merges redhat provider into heartbeat provider. Remove
rgmanager's redhat provider.