pool/pacemaker
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 379413 from network:ha-clustering:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/379413
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=99
This commit is contained in:
Dominique Leuenberger 2016-04-07 11:27:53 +00:00 committed by Git OBS Bridge
commit cf6c125587
7 changed files with 231 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -8,10 +8,10 @@
To update to a new release, change "revision" to the desired
git commit hash and bump "version" if necessary
<param name="version">1.1.13</param>
<param name="version">1.1.14</param>
-->
<param name="versionformat">1.1.13+git%cd.%h</param>
<param name="revision">a7d6e6b56fd2779a07970df7de4e0fb0b22742d3</param>
<param name="versionformat">1.1.14+git%cd.%h</param>
<param name="revision">5a6cdd11b4f93b4d55e1b2654078018c339931d4</param>
</service>
<service name="recompress" mode="disabled">

26
bug-728579_pacemaker-stonith-dev-id.patch
View File

@ -4,11 +4,11 @@ Date: Thu Sep 6 15:14:58 2012 +0800
Medium: stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable
Index: pacemaker/fencing/commands.c
Index: pacemaker-1.1.14+git20160209.8d93feb/fencing/commands.c
===================================================================
--- pacemaker.orig/fencing/commands.c
+++ pacemaker/fencing/commands.c
@@ -608,6 +608,7 @@ build_device_from_xml(xmlNode * msg)
--- pacemaker-1.1.14+git20160209.8d93feb.orig/fencing/commands.c
+++ pacemaker-1.1.14+git20160209.8d93feb/fencing/commands.c
@@ -826,6 +826,7 @@ build_device_from_xml(xmlNode * msg)
device->id, device->on_target_actions);
}
@ -16,10 +16,10 @@ Index: pacemaker/fencing/commands.c
device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
/* TODO: Hook up priority */
Index: pacemaker/lib/fencing/st_client.c
Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
===================================================================
--- pacemaker.orig/lib/fencing/st_client.c
+++ pacemaker/lib/fencing/st_client.c
--- pacemaker-1.1.14+git20160209.8d93feb.orig/lib/fencing/st_client.c
+++ pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
@@ -54,6 +54,7 @@ struct stonith_action_s {
char *action;
char *victim;
@ -28,7 +28,7 @@ Index: pacemaker/lib/fencing/st_client.c
int timeout;
int async;
void *userdata;
@@ -559,6 +560,7 @@ stonith_action_destroy(stonith_action_t
@@ -679,6 +680,7 @@ stonith_action_destroy(stonith_action_t
free(action->args);
free(action->action);
free(action->victim);
@ -36,7 +36,7 @@ Index: pacemaker/lib/fencing/st_client.c
free(action);
}
@@ -586,6 +588,8 @@ stonith_action_create(const char *agent,
@@ -706,6 +708,8 @@ stonith_action_create(const char *agent,
if (device_args) {
char buffer[512];
const char *value = NULL;
@ -45,7 +45,7 @@ Index: pacemaker/lib/fencing/st_client.c
snprintf(buffer, 511, "pcmk_%s_retries", _action);
value = g_hash_table_lookup(device_args, buffer);
@@ -593,6 +597,11 @@ stonith_action_create(const char *agent,
@@ -713,6 +717,11 @@ stonith_action_create(const char *agent,
if (value) {
action->max_retries = atoi(value);
}
@ -57,7 +57,7 @@ Index: pacemaker/lib/fencing/st_client.c
}
return action;
@@ -745,6 +754,8 @@ internal_stonith_action_execute(stonith_
@@ -894,6 +903,8 @@ internal_stonith_action_execute(stonith_
if (!pid) {
/* child */
@ -66,9 +66,9 @@ Index: pacemaker/lib/fencing/st_client.c
setpgid(0, 0);
close(1);
@@ -765,6 +776,10 @@ internal_stonith_action_execute(stonith_
close(p_read_fd);
@@ -916,6 +927,10 @@ internal_stonith_action_execute(stonith_
close(p_write_fd);
close(p_stderr_fd);
+ if (action->dev_id) {
+ setenv(st_dev_id_key, action->dev_id, 1);

37
bug-806256_pacemaker-log-level-notice.patch
View File

@ -4,24 +4,11 @@ Date: Thu Mar 14 09:41:53 2013 +0800
Log: Change some messages to notice level (bnc#806256)
Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/callbacks.c
Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
===================================================================
--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/crmd/callbacks.c
+++ pacemaker-1.1.13+git20150720.bd8c4b5/crmd/callbacks.c
@@ -210,7 +210,7 @@ peer_update_callback(enum crm_status_typ
const char *task = crm_element_value(down->xml, XML_LRM_ATTR_TASK);
if (alive && safe_str_eq(task, CRM_OP_FENCE)) {
- crm_info("Node return implies stonith of %s (action %d) completed", node->uname,
+ crm_notice("Node return implies stonith of %s (action %d) completed", node->uname,
down->id);
st_fail_count_reset(node->uname);
Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/membership.c
===================================================================
--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/crmd/membership.c
+++ pacemaker-1.1.13+git20150720.bd8c4b5/crmd/membership.c
@@ -430,7 +430,7 @@ crm_update_quorum(gboolean quorum, gbool
--- pacemaker-1.1.14+git20160209.8d93feb.orig/crmd/membership.c
+++ pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
@@ -425,7 +425,7 @@ crm_update_quorum(gboolean quorum, gbool
crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid);
fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL);
@ -30,11 +17,11 @@ Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/membership.c
fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete);
free_xml(update);
}
Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/tengine.c
Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
===================================================================
--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/crmd/tengine.c
+++ pacemaker-1.1.13+git20150720.bd8c4b5/crmd/tengine.c
@@ -204,7 +204,7 @@ do_te_invoke(long long action,
--- pacemaker-1.1.14+git20160209.8d93feb.orig/crmd/tengine.c
+++ pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
@@ -214,7 +214,7 @@ do_te_invoke(long long action,
destroy_graph(transition_graph);
transition_graph = unpack_graph(graph_data, graph_input);
CRM_CHECK(transition_graph != NULL, transition_graph = create_blank_graph(); return);
@ -43,11 +30,11 @@ Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/tengine.c
graph_input);
te_reset_job_counts();
Index: pacemaker-1.1.13+git20150720.bd8c4b5/fencing/remote.c
Index: pacemaker-1.1.14+git20160209.8d93feb/fencing/remote.c
===================================================================
--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/fencing/remote.c
+++ pacemaker-1.1.13+git20150720.bd8c4b5/fencing/remote.c
@@ -596,7 +596,7 @@ remote_op_timeout(gpointer userdata)
--- pacemaker-1.1.14+git20160209.8d93feb.orig/fencing/remote.c
+++ pacemaker-1.1.14+git20160209.8d93feb/fencing/remote.c
@@ -574,7 +574,7 @@ remote_op_timeout(gpointer userdata)
return FALSE;
}

3
pacemaker-1.1.13+git20151201.a7d6e6b.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef468d028f46d22614292220089c40a5a36d74fbf8a7db96f294317193f98037
size 3723195

3
pacemaker-1.1.14+git20160324.5a6cdd1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d6ee4ab1f2cc8779a00389577007792b52e38a0dd326538322fd844554278d61
size 3770202

145
pacemaker.changes
View File

@ -1,3 +1,138 @@
-------------------------------------------------------------------
Thu Mar 24 17:26:44 UTC 2016 - ygao@suse.com
- crmd: update cluster state in CIB after fencing an unseen node
- crmd: don't abort transition for expected remote node shutdown
- libtransition: potential memory leak if unpacking action fails
- Upstream version cs: 5a6cdd11b4f93b4d55e1b2654078018c339931d4
-------------------------------------------------------------------
Thu Mar 17 10:04:23 UTC 2016 - ygao@suse.com
- attrd: crash on exit if initialization fails
- build: fix scalability regression
- pengine: Suppress assert if a stateful clone is not being demoted/stopped (bsc#971129)
- attrd: Support of the dampen change by attrd.
- PE: Correctly handle the ordering of demote actions for failed and moving containers
- Upstream version cs: d076e9dbf9827f7801c89c6d635df370aeca5e90
-------------------------------------------------------------------
Mon Mar 7 15:07:27 UTC 2016 - ygao@suse.com
- crmd,tools: Set attributes for remote nodes directly into cib if it's legacy attrd (bsc#967775)
- libcib: Correctly determine the node type (bsc#967775)
- resources: match agents' default for globally_unique to pacemaker's
- crm_mon: Help admins identify why resources are not being started or responding to commands
- PE: Memory leak
- crm_resource: Prevent segfault when --resource is not correctly supplied for --restart command
- Build: Create CRM_CORE_DIR during installation
- Upstream version cs: eb89393a82eb41ff50d041b91765ccac52e873e0
-------------------------------------------------------------------
Mon Feb 29 11:53:36 UTC 2016 - ygao@suse.com
- cpg: Ensure group name is never unset
- remote: Simplify calls to accept() and inet_ntop() by using "struct sockaddr_storage" (bsc#964183)
- remote: cl#5269 - Notify other clients of a new connection only if the handshake has completed (bsc#967388)
- remote: Correctly display the IP address of the remote client (bsc#964183)
- spec: declare also BSD license as suitable
- libservices: Add error handling for pipe() failed.
- libservices: Check resource agent is executable or not before pipe open.
- crmd: Prevent use-after-free when an unexpected remote client takes over (bsc#964183)
- pacemakerd: Correction of the stonithd process judgment of pacemakerd.
- crmd: Do not turn on stonith-watchdog-timeout automatically if SBD is detected
- remote: Correctly check for SBD configuration consistency
- resources: Fix state file metadata in Dummy, Stateful and HealthCPU resource agents
- systemd: Modified so that the cluster to stop before the rsyslog
- common: Correctly locate sbd via its pidfile
- common: Assume processes are active if we get EACCESS
- Fencing: Simplify watchdog integration
- crmd: Only poopulate stonith-watchdog-timeout if SBD is active
- remote: Ensure SBD is consistently configured on remote nodes
- remote: Allow cluster and remote LRM API versions to diverge
- cib: Do not send notifications when the dryrun flag is present
- Upstream version cs: cf67796823c4429714857411e614cfacfbc59d89
-------------------------------------------------------------------
Mon Feb 15 09:31:25 UTC 2016 - ygao@suse.com
- crm_shadow: fix broken --display command
- ipc: Respect the parameter of pick_ipc_buffer() but don't let it affect the global value
- libcluster: crm_peer_uname() should return NULL if uuid is invalid
- remote: recover from remote node fencing more quickly
- crmd: update node state for migrated pacemaker_remote nodes
- crmd: update node state for stopped pacemaker_remote nodes
- crmd: update node state for started pacemaker_remote nodes
- crmd: add new message type for updating pacemaker_remote node state
- libcluster: set remote peer cache state based on CIB node state
- libcluster: send notifications when pacemaker_remote nodes are started
- crmd: report pacemaker_remote node state in CIB status section
- Upstream version cs: c851a117bc77bdefe15181a7d753f1aed867cde6
-------------------------------------------------------------------
Thu Feb 11 13:28:13 UTC 2016 - ygao@suse.com
- spec: Move the common directories under /var/lib/pacemaker into pacemaker-cli package
- liblrmd: Prevent potential use-after-free (bsc#964183)
- crmd: Disconnect the relevant remote proxies as well when disconnecting a remote node (bsc#964183)
- crmd: Prevent potential use-after-free (bsc#964183)
- liblrmd: Prevent potential use-after-free issues (bsc#964183)
- PE: Fix conditions for internal sanity check (bsc#971129)
- attrd: ensure remote nodes are in correct peer cache
- crmd: set remote flag when gracefully shutting down remote nodes
- fencing: Correctly track active stonith actions (bsc#938545)
- fencing: Functionize adding and removing active pids of device (bsc#938545)
- crm_shadow: Do not invoke shells with --noprofile option other than bash (bsc#961392)
- lib/common: check return value of dlsym() and not dlerror()
- lib/ipc: allow PCMK_ipc_buffer to be smaller than default max sizes
- lib/services: use self-pipe sigchld handling when signalfd isn't available
- spec: associate subpackage with correct licenses
- spec: rely on system-wide RPM macros if available
- spec: C++ compiler is not something currently needed
- RHBZ#1286316: Do an ordered shutdown of systemd resources
- header == NULL when parsing compressed message
- attrd: Correctly implement mass removal of a node's attributes
- attrd: Hook up the client name so we can track requests
- crmd: Set the shutdown transient attribute in response to LRMD_IPC_OP_SHUTDOWN_REQ from remote nodes
- PE: Honor the shutdown transient attributes for remote nodes
- pacemaker_remote: support graceful stops
- crmd: support graceful pacemaker_remote stops
- lrmd,liblrmd: add lrmd IPC operations for requesting and acknowledging shutdown
- fencing: Support concurrent fencing actions on each device (bsc#938545)
- pengine: Support concurrent fencing (bsc#938545)
- Upstream version cs: c54f10440a7bba5a1491ea8506925c7d6d9ca2a3
-------------------------------------------------------------------
Thu Jan 21 15:11:39 UTC 2016 - ygao@suse.com
- Update to version 1.1.14
- fencing: free only after last usage makes coverity happy
- crmd: 0 is a valid fd makes coverity happy
- tools: crm_resource compile issue
- crm_resource --list-agents: don't print uninitialized memory
- extra: update SNMP MIB with new pacemakerTrap OID containing pacemakerNotificationTrap
- fencing, libfencing: remap fence agent error codes before async callback (bsc#962309)
- libfencing: topology is not used
- fencing: topology is not used
- libcrmcommon: when caching attrd connection, cache connection flags as well
- cts: Plugin-based cluster has its own PacemakerUp pattern
- Upstream version cs: 70404b0e5ecbe5e51d07c6c2233eea640cbd720a (Pacemaker-1.1.14)
-------------------------------------------------------------------
Fri Dec 18 17:48:52 UTC 2015 - ygao@suse.com
- Rebase:
* bug-806256_pacemaker-log-level-notice.patch
* bug-728579_pacemaker-stonith-dev-id.patch
- core: Mistake of the parameter order.
- RHBZ#1287315: stonithd: Trigger cib_devices_update in case of deletion of just an attribute
- CLBZ#5253: stonithd: Do not intermingle stdout & stderr coming from stonith-RAs (bsc#962309)
- resources: allow for top output with or without percent sign in HealthCPU
- controld: Return error when DLM status is wait fencing (RHBZ#1268313)
- crmd: Don't update cluster/peer CIB fields when processing stonith results
- Upstream version cs: e16447de89d25db3b3578c7e080c1a4c2f85806f
-------------------------------------------------------------------
Wed Dec 2 11:55:11 UTC 2015 - ygao@suse.com
@ -102,10 +237,10 @@ Thu Oct 8 10:29:54 UTC 2015 - ygao@suse.com
- Fencing: Correctly construct simple topologies with stonith_admin
- Fencing: Correctly remove topologies and detect invalid entries
- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332)
- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* Drop bug-946332_pacemaker-resource-agent-remote-message.patch which has been merged upstream
- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332)
- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* Drop bug-946332_pacemaker-resource-agent-remote-usage.patch which has been merged upstream
- libcib: find_nvpair_attr_delegate: check buffer overflow
@ -115,10 +250,10 @@ Thu Oct 8 10:29:54 UTC 2015 - ygao@suse.com
-------------------------------------------------------------------
Fri Sep 18 08:22:19 UTC 2015 - ygao@suse.com
- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332)
- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* bug-946332_pacemaker-resource-agent-remote-message.patch
- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332)
- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* bug-946332_pacemaker-resource-agent-remote-usage.patch
-------------------------------------------------------------------
@ -574,7 +709,7 @@ Fri Nov 21 15:38:57 UTC 2014 - ygao@suse.com
- crm_node: Correctly remove nodes from the CIB by nodeid
- fencing: Allow nodes to be purged from the member cache
- xml: cl#5231 - Unset the deleted attributes in the resulting diffs (bsc#905641)
- xml: cl#5231 - Unset the deleted attributes in the resulting diffs (bsc#905641, bsc#967254)
- fencing: stonith -l option for custom log
- cib: Avoid nodeid conflicts we don't care about
- Membership: Detect and resolve nodes that change their ID

82
pacemaker.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package pacemaker
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -33,7 +33,11 @@
%global rawhide 0
#%%global cs_version %%(pkg-config corosync --modversion | awk -F . '{print $1}')
%global cs_version 2
%global py_site %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
# It has to be eventually decided whether to use Python2 or Python3
%global py_site %{?python_sitearch}%{!?python_sitearch:%(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
# https://fedoraproject.org/wiki/EPEL:Packaging?rd=Packaging:EPEL#The_.25license_tag
%{!?_licensedir:%global license %doc}
# Conditionals
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
@ -98,9 +102,15 @@
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+
%if %{defined _unitdir}
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+
%else
# initscript is Revised BSD
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause
%endif
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
Group: Productivity/Clustering/HA
Version: 1.1.13+git20151201.a7d6e6b
Version: 1.1.14+git20160324.5a6cdd1
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@ -143,10 +153,9 @@ Suggests: graphviz
ExclusiveArch: i386 i686 x86_64
%endif
# Required for core functionality
# Required for core functionality (python-devel depends on python)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: pkgconfig(glib-2.0)
%if 0%{?suse_version}
@ -373,6 +382,19 @@ Group: Productivity/Clustering/HA
Requires: libpacemaker3 = %{version}-%{release}
Requires: python
# systemd python bindings are separate package in some distros
%if %{defined systemd_requires}
%if 0%{?fedora} > 20
Requires: systemd-python
%endif
%if 0%{?rhel} > 6
Requires: systemd-python
%endif
%endif
%description cts
Test framework for cluster-related technologies like Pacemaker
@ -455,7 +477,6 @@ make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} V=1 install
#mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p ${RPM_BUILD_ROOT}%{_var}/lib/pacemaker/cores
#install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker
install -m 644 mcp/pacemaker.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pacemaker
#install -m 644 tools/crm_mon.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/crm_mon
@ -513,10 +534,6 @@ done
#%systemd_post pacemaker.service
%service_add_post pacemaker.service
if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
%fillup_only pacemaker
fi
%pre
%service_add_pre pacemaker.service
@ -525,17 +542,13 @@ fi
%service_del_preun pacemaker.service
%postun
#%systemd_postun_with_restart pacemaker.service
#%systemd_postun_with_restart pacemaker.service
%service_del_postun pacemaker.service
%post remote
#%systemd_post pacemaker_remote.service
%service_add_post pacemaker_remote.service
if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
%fillup_only pacemaker
fi
%pre remote
%service_add_pre pacemaker_remote.service
@ -544,10 +557,15 @@ fi
%service_del_preun pacemaker_remote.service
%postun remote
#%systemd_postun_with_restart pacemaker_remote.service
#%systemd_postun_with_restart pacemaker_remote.service
%service_del_postun pacemaker_remote.service
%post cli
if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
%fillup_only pacemaker
fi
#%systemd_post crm_mon.service
%service_add_post crm_mon.service
@ -588,6 +606,12 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del pacemaker_remote || :
fi
%post cli
if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
%fillup_only pacemaker
fi
%endif
%pre -n libpacemaker3
@ -648,6 +672,9 @@ fi
%{_sbindir}/fence_pcmk
%{_sbindir}/stonith_admin
%doc %{_mandir}/man7/crmd.*
%doc %{_mandir}/man7/pengine.*
%doc %{_mandir}/man7/stonithd.*
%doc %{_mandir}/man7/ocf_pacemaker_controld.*
%doc %{_mandir}/man7/ocf_pacemaker_o2cb.*
%doc %{_mandir}/man7/ocf_pacemaker_remote.*
@ -657,15 +684,13 @@ fi
%doc %{_mandir}/man8/pacemakerd.*
%doc %{_mandir}/man8/stonith_admin.*
#%license COPYING
%doc COPYING
%doc AUTHORS
%doc ChangeLog
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
/usr/lib/ocf/resource.d/pacemaker/controld
/usr/lib/ocf/resource.d/pacemaker/o2cb
/usr/lib/ocf/resource.d/pacemaker/remote
@ -730,6 +755,9 @@ fi
%config(noreplace) /var/adm/fillup-templates/sysconfig.pacemaker
%config(noreplace) /var/adm/fillup-templates/sysconfig.crm_mon
%doc %{_mandir}/man7/*
%exclude %{_mandir}/man7/crmd.*
%exclude %{_mandir}/man7/pengine.*
%exclude %{_mandir}/man7/stonithd.*
%exclude %{_mandir}/man7/ocf_pacemaker_controld.*
%exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
%exclude %{_mandir}/man7/ocf_pacemaker_remote.*
@ -741,10 +769,15 @@ fi
%exclude %{_mandir}/man8/pacemaker_remoted.*
%exclude %{_mandir}/man8/stonith_admin.*
#%license COPYING
%doc COPYING
%doc AUTHORS
%doc ChangeLog
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
%files -n libpacemaker3
%defattr(-,root,root)
@ -757,6 +790,7 @@ fi
%{_libdir}/libpengine.so.*
%{_libdir}/libstonithd.so.*
%{_libdir}/libtransitioner.so.*
#%license COPYING.LIB
%doc COPYING.LIB
%doc AUTHORS
%{_libdir}/libcrmcluster.so.*
@ -765,6 +799,7 @@ fi
%files -n libpacemaker3-cluster
%defattr(-,root,root)
#%{_libdir}/libcrmcluster.so.*
#%license COPYING.LIB
%doc COPYING.LIB
%doc AUTHORS
%endif
@ -782,7 +817,8 @@ fi
%{_sbindir}/pacemaker_remoted
%{_mandir}/man8/pacemaker_remoted.*
%doc COPYING.LIB
#%license COPYING
%doc COPYING
%doc AUTHORS
%if %{with_doc}
@ -797,7 +833,8 @@ fi
%{py_sitedir}/cts
%{_datadir}/pacemaker/tests/cts
%{_libexecdir}/pacemaker/lrmd_test
%doc COPYING.LIB
#%license COPYING
%doc COPYING
%doc AUTHORS
%files -n libpacemaker-devel
@ -810,6 +847,7 @@ fi
%{_var}/lib/pacemaker/gcov
%endif
%{_libdir}/pkgconfig/*.pc
#%license COPYING.LIB
%doc COPYING.LIB
%doc AUTHORS