Accepting request 406453 from home:yan_gao:branches:network:ha-clustering:Factory:Test

- ping: Log sensible error when /tmp is full (bsc#987348)
- crm_mon: Do not log errors for the known CIB changes that should be ignored (bsc#986931)
- logging: Enable synchronous logging when blackboxes are enabled
- libpengine: print target role and blocked status in XML output
- tools: add maintenance mode and disabled/blocked resources to crm_mon XML/HTML output
- tools: break up long lines in crm_mon console output
- libservices: include socket units when listing all systemd agents
- fencing: fence_legacy - Search capable devices by querying them through "list" action for cluster-glue stonith agents (bsc#986265)
- extra: correct quoting of timestamp-format in alert-snmp-example
- pengine,tools: Display pending resource state by default when it's available (bsc#986201)
- rng: Allow rsc-pattern in locations for version 2.6
- pengine: Expand regexp references in location constraints
- pengine: Allow to set base score for progressive node health strategy
- systemd: Allow unit names ending in .socket.
- watchdog: Correction to do to change action of the system reboot by fail_fast
- Upstream version cs: 630d0d112092042b6f79c2a02bb442e82fee93ec

- Remove conditionals that are not really needed as they always kept
  the values
- Remove the cman conditional as we do not even have the dependencies
  to build with it in OBS
- Convert deps to pkgconfig style ones and remove deps that are
  not mentioned by the testsuite or the configure.ac

- Update to version 1.1.15
- crmd: mention that graceful remote shutdowns may cause connection failures (bsc#981489)
- alerts - drop 5min timeout to 30s since it is configurable now
- Bug bz#5292 - crmd: wait for alerts to finish
- libais,libcluster,libcrmcommon,liblrmd: don't use %z specifier
- alerts: ensure sample alert agents handle undefined recipient

OBS-URL: https://build.opensuse.org/request/show/406453
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=248
This commit is contained in:
Yan Gao 2016-07-04 15:06:14 +00:00 committed by Git OBS Bridge
parent 2b3ea92213
commit 31da03a182
5 changed files with 133 additions and 95 deletions

View File

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

View File

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

View File

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

View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Fri Jul 1 23:10:54 UTC 2016 - ygao@suse.com
- ping: Log sensible error when /tmp is full (bsc#987348)
- crm_mon: Do not log errors for the known CIB changes that should be ignored (bsc#986931)
- logging: Enable synchronous logging when blackboxes are enabled
- libpengine: print target role and blocked status in XML output
- tools: add maintenance mode and disabled/blocked resources to crm_mon XML/HTML output
- tools: break up long lines in crm_mon console output
- libservices: include socket units when listing all systemd agents
- fencing: fence_legacy - Search capable devices by querying them through "list" action for cluster-glue stonith agents (bsc#986265)
- extra: correct quoting of timestamp-format in alert-snmp-example
- pengine,tools: Display pending resource state by default when it's available (bsc#986201)
- rng: Allow rsc-pattern in locations for version 2.6
- pengine: Expand regexp references in location constraints
- pengine: Allow to set base score for progressive node health strategy
- systemd: Allow unit names ending in .socket.
- watchdog: Correction to do to change action of the system reboot by fail_fast
- Upstream version cs: 630d0d112092042b6f79c2a02bb442e82fee93ec
-------------------------------------------------------------------
Thu Jun 30 13:16:25 UTC 2016 - tchvatal@suse.com
- Remove conditionals that are not really needed as they always kept
the values
- Remove the cman conditional as we do not even have the dependencies
to build with it in OBS
- Convert deps to pkgconfig style ones and remove deps that are
not mentioned by the testsuite or the configure.ac
-------------------------------------------------------------------
Wed Jun 22 12:25:47 UTC 2016 - ygao@suse.com
- Update to version 1.1.15
- crmd: mention that graceful remote shutdowns may cause connection failures (bsc#981489)
- alerts - drop 5min timeout to 30s since it is configurable now
- Bug bz#5292 - crmd: wait for alerts to finish
- libais,libcluster,libcrmcommon,liblrmd: don't use %z specifier
- alerts: ensure sample alert agents handle undefined recipient
- tools: crm_resource -T option should not be hidden anymore
- PE: Correctly update the dependant actions of un-runnable clones
- alerts: make timestamp-format-string work properly if strftime-escape is the last character
- extra: make alert-file-example cope with spaces in timeformat-string
- attrd,ipc: Prevent possible segfault on exit (bsc#986056)
- alerts: fix SMTP recipient defaulting
- tools: properly handle crm_resource --restart with a resource in a group
- tools: don't assume all resources restart on same node with crm_resource --restart
- tools: avoid memory leaks in crm_resource --restart
- tools: remember any existing target-role when doing crm_resource --restart
- tools: correctly count starting resources when doing crm_resource --restart
- Upstream version cs: e174ec84857e087210b9dacee3318f8203176129 (Pacemaker-1.1.15)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 14 11:35:04 UTC 2016 - tchvatal@suse.com Tue Jun 14 11:35:04 UTC 2016 - tchvatal@suse.com
@ -78,8 +130,8 @@ Sun May 29 14:44:18 UTC 2016 - ygao@suse.com
- crmd: Acknowledge cancellation operations for remote connection resources (bsc#976865) - crmd: Acknowledge cancellation operations for remote connection resources (bsc#976865)
- controld: improve DLM check with stateful_merge_wait (bsc#977201) - controld: improve DLM check with stateful_merge_wait (bsc#977201)
- attrd, libcrmcommon: validate attrd requests better - attrd, libcrmcommon: validate attrd requests better
- crmd: clear remote node transient attributes on disconnect - crmd: clear remote node transient attributes on disconnect (bsc#981489)
- Revert "Fix: attrd: Correctly implement mass removal of a node's attributes" - Revert "Fix: attrd: Correctly implement mass removal of a node's attributes" (bsc#981489)
- crm_mon: Fix time formatting on x32 - crm_mon: Fix time formatting on x32
- resources: use OCF version tagging correctly - resources: use OCF version tagging correctly
- libcommon: crm_procfs_pid_of() would always return last /proc entry checked - libcommon: crm_procfs_pid_of() would always return last /proc entry checked
@ -200,8 +252,8 @@ Thu Feb 11 13:28:13 UTC 2016 - ygao@suse.com
- crmd: Prevent potential use-after-free (bsc#964183) - crmd: Prevent potential use-after-free (bsc#964183)
- liblrmd: Prevent potential use-after-free issues (bsc#964183) - liblrmd: Prevent potential use-after-free issues (bsc#964183)
- PE: Fix conditions for internal sanity check (bsc#971129) - PE: Fix conditions for internal sanity check (bsc#971129)
- attrd: ensure remote nodes are in correct peer cache - attrd: ensure remote nodes are in correct peer cache (bsc#981489)
- crmd: set remote flag when gracefully shutting down remote nodes - crmd: set remote flag when gracefully shutting down remote nodes (bsc#981489)
- fencing: Correctly track active stonith actions (bsc#938545) - fencing: Correctly track active stonith actions (bsc#938545)
- fencing: Functionize adding and removing active pids of device (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) - crm_shadow: Do not invoke shells with --noprofile option other than bash (bsc#961392)
@ -213,13 +265,13 @@ Thu Feb 11 13:28:13 UTC 2016 - ygao@suse.com
- spec: C++ compiler is not something currently needed - spec: C++ compiler is not something currently needed
- RHBZ#1286316: Do an ordered shutdown of systemd resources - RHBZ#1286316: Do an ordered shutdown of systemd resources
- header == NULL when parsing compressed message - header == NULL when parsing compressed message
- attrd: Correctly implement mass removal of a node's attributes - attrd: Correctly implement mass removal of a node's attributes (bsc#981489)
- attrd: Hook up the client name so we can track requests - 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 - crmd: Set the shutdown transient attribute in response to LRMD_IPC_OP_SHUTDOWN_REQ from remote nodes (bsc#981489)
- PE: Honor the shutdown transient attributes for remote nodes - PE: Honor the shutdown transient attributes for remote nodes (bsc#981489)
- pacemaker_remote: support graceful stops - pacemaker_remote: support graceful stops (bsc#981489)
- crmd: support graceful pacemaker_remote stops - crmd: support graceful pacemaker_remote stops (bsc#981489)
- lrmd,liblrmd: add lrmd IPC operations for requesting and acknowledging shutdown - lrmd,liblrmd: add lrmd IPC operations for requesting and acknowledging shutdown (bsc#981489)
- fencing: Support concurrent fencing actions on each device (bsc#938545) - fencing: Support concurrent fencing actions on each device (bsc#938545)
- pengine: Support concurrent fencing (bsc#938545) - pengine: Support concurrent fencing (bsc#938545)
- Upstream version cs: c54f10440a7bba5a1491ea8506925c7d6d9ca2a3 - Upstream version cs: c54f10440a7bba5a1491ea8506925c7d6d9ca2a3
@ -338,7 +390,7 @@ Thu Oct 8 10:29:54 UTC 2015 - ygao@suse.com
- crmd: properly detect CIB update failures for remote nodes - crmd: properly detect CIB update failures for remote nodes
- cibadmin: Prevent potential use-of-NULL in print_xml_output() (bsc#947180) - cibadmin: Prevent potential use-of-NULL in print_xml_output() (bsc#947180)
- Fencing: The device list is expected to be comma separated - Fencing: The device list is expected to be comma separated
- Tools: Do not send command lines to syslog - Tools: Do not send command lines to syslog (bsc#986676)
- Tools: Repair the logging of 'interesting' command-lines - Tools: Repair the logging of 'interesting' command-lines
- PE: resolve memory leak - PE: resolve memory leak
- libfencing: make topology level removal compatible with latest stonithd API - libfencing: make topology level removal compatible with latest stonithd API

View File

@ -19,17 +19,14 @@
%global gname haclient %global gname haclient
%global uname hacluster %global uname hacluster
%global pcmk_docdir %{_docdir}/%{name} %global pcmk_docdir %{_docdir}/%{name}
%define with_corosync_support 1 %global cs_version 2
%define with_nagios 1 %define with_nagios 1
%define with_snmp 1
%define with_esmtp 1 %define with_esmtp 1
%define with_acl 1
%define with_cibsecrets 1 %define with_cibsecrets 1
%define enable_lib_cluster_pkg 0 %define enable_lib_cluster_pkg 0
%define enable_fatal_warnings 1 %define enable_fatal_warnings 0
%define with_regression_tests 0 %define with_regression_tests 0
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
# Conditionals # Conditionals
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>" # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
# to disable or enable specific features # to disable or enable specific features
@ -37,17 +34,13 @@
%bcond_without stonithd %bcond_without stonithd
# We generate docs using Publican, Asciidoc and Inkscape, but they're not available everywhere # We generate docs using Publican, Asciidoc and Inkscape, but they're not available everywhere
%bcond_with doc %bcond_with doc
# Use a different versioning scheme
%bcond_with pre_release
# Turn off cman support
%bcond_with cman
Name: pacemaker Name: pacemaker
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary Version: 1.1.15+git20160701.630d0d1
Version: 1.1.14+git20160612.dd46368
Release: 0 Release: 0
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
Url: http://www.clusterlabs.org Url: http://www.clusterlabs.org
# eg. https://github.com/ClusterLabs/pacemaker/archive/8ae45302394b039fb098e150f156df29fc0cb576/pacemaker-8ae4530.tar.gz # eg. https://github.com/ClusterLabs/pacemaker/archive/8ae45302394b039fb098e150f156df29fc0cb576/pacemaker-8ae4530.tar.gz
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
@ -65,35 +58,32 @@ Patch9: bug-977201_pacemaker-controld-self-fencing.patch
# Required for core functionality (python-devel depends on python) # Required for core functionality (python-devel depends on python)
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
# Enables optional functionality
BuildRequires: bison BuildRequires: bison
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex BuildRequires: flex
BuildRequires: help2man BuildRequires: help2man
BuildRequires: libbz2-devel
BuildRequires: libgnutls-devel
# We need reasonably recent versions of libqb
BuildRequires: libqb-devel > 0.11.0
BuildRequires: libselinux-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: net-snmp-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python BuildRequires: python
BuildRequires: python-devel
# Required for agent_config.h which specifies the correct scratch directory # Required for agent_config.h which specifies the correct scratch directory
BuildRequires: resource-agents BuildRequires: resource-agents
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(corosync)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libexslt)
# We need reasonably recent versions of libqb
BuildRequires: pkgconfig(libqb) > 0.11.0
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(uuid)
Requires: %{name}-cli = %{version}-%{release} Requires: %{name}-cli = %{version}-%{release}
Requires: corosync
Requires: libpacemaker3 = %{version}-%{release} Requires: libpacemaker3 = %{version}-%{release}
Requires: libqb > 0.11.0 Requires: libqb > 0.11.0
Requires: psmisc Requires: psmisc
@ -112,24 +102,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{enable_lib_cluster_pkg} %if %{enable_lib_cluster_pkg}
Requires: libpacemaker3-cluster = %{version}-%{release} Requires: libpacemaker3-cluster = %{version}-%{release}
%endif %endif
%if %{with cman} # Enables optional functionality
BuildRequires: clusterlib-devel %if 0%{?suse_version} > 1100
# pacemaker initscript: cman initscript, fence_tool (+ some soft-dependencies) BuildRequires: docbook-xsl-stylesheets
# "post" scriptlet: ccs_update_schema %else
Requires: cman BuildRequires: docbook-style-xsl
%endif
%if %{with_corosync_support}
BuildRequires: libcorosync-devel
Requires: corosync
%endif %endif
%if %{with stonithd} %if %{with stonithd}
%if 0%{?suse_version}
BuildRequires: libglue-devel BuildRequires: libglue-devel
%else
BuildRequires: cluster-glue-libs-devel
%endif
%endif %endif
%if %{with doc} %if %{with doc}
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: inkscape BuildRequires: inkscape
BuildRequires: publican BuildRequires: publican
%endif %endif
%if %{with_snmp}
BuildRequires: net-snmp-devel
%endif
%if %{with_esmtp} %if %{with_esmtp}
BuildRequires: libesmtp-devel BuildRequires: libesmtp-devel
%endif %endif
@ -137,7 +130,6 @@ BuildRequires: libesmtp-devel
BuildRequires: procps BuildRequires: procps
BuildRequires: python-curses BuildRequires: python-curses
BuildRequires: python-xml BuildRequires: python-xml
BuildRequires: vim-base
%endif %endif
%description %description
@ -154,7 +146,7 @@ resource health.
%package cli %package cli
Summary: Command line tools for controlling Pacemaker clusters Summary: Command line tools for controlling Pacemaker clusters
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Requires: libpacemaker3 = %{version} Requires: libpacemaker3 = %{version}-%{release}
Requires: logrotate Requires: logrotate
Requires: perl-TimeDate Requires: perl-TimeDate
@ -181,7 +173,7 @@ nodes and those just running the CLI tools.
%package -n libpacemaker3-cluster %package -n libpacemaker3-cluster
Summary: Cluster Libraries used by Pacemaker Summary: Cluster Libraries used by Pacemaker
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Requires: libpacemaker3 = %{version} Requires: libpacemaker3 = %{version}-%{release}
%description -n libpacemaker3-cluster %description -n libpacemaker3-cluster
Pacemaker is an advanced, scalable High-Availability cluster resource Pacemaker is an advanced, scalable High-Availability cluster resource
@ -194,8 +186,8 @@ libraries needed for nodes that will form part of the cluster nodes.
%package remote %package remote
Summary: Pacemaker remote daemon for non-cluster nodes Summary: Pacemaker remote daemon for non-cluster nodes
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Requires: %{name}-cli = %{version} Requires: %{name}-cli = %{version}-%{release}
Requires: libpacemaker3 = %{version} Requires: libpacemaker3 = %{version}-%{release}
Requires: resource-agents Requires: resource-agents
%{?systemd_requires} %{?systemd_requires}
@ -211,17 +203,18 @@ nodes not running the full corosync/cluster stack.
Summary: Pacemaker development package Summary: Pacemaker development package
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-cts = %{version}-%{release} Requires: %{name}-cts = %{version}-%{release}
Requires: glib2-devel Requires: libpacemaker3 = %{version}-%{release}
Requires: libbz2-devel
Requires: libcorosync-devel
Requires: libpacemaker3 = %{version}
Requires: libqb-devel
Requires: libtool-ltdl-devel Requires: libtool-ltdl-devel
Requires: libuuid-devel Requires: pkgconfig
Requires: libxml2-devel Requires: pkgconfig(bzip2)
Requires: libxslt-devel Requires: pkgconfig(corosync)
Requires: pkgconfig(glib-2.0)
Requires: pkgconfig(libqb)
Requires: pkgconfig(libxml-2.0)
Requires: pkgconfig(libxslt)
Requires: pkgconfig(uuid)
%if %{enable_lib_cluster_pkg} %if %{enable_lib_cluster_pkg}
Requires: libpacemaker3-cluster = %{version} Requires: libpacemaker3-cluster = %{version}-%{release}
%endif %endif
%if %{with_regression_tests} %if %{with_regression_tests}
# For the regression tests, we can run them only if all pacemaker # For the regression tests, we can run them only if all pacemaker
@ -238,13 +231,13 @@ The libpacemaker-devel package contains headers and shared libraries
for developing tools for Pacemaker. for developing tools for Pacemaker.
%package cts %package cts
Summary: Test framework for cluster-related technologies like Pacemaker Summary: Test framework for cluster-related technologies
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Requires: libpacemaker3 = %{version} Requires: libpacemaker3 = %{version}-%{release}
Requires: python Requires: python
%description cts %description cts
Testing framework for cluster-related technologies like Pacemaker Test framework for cluster-related technologies like Pacemaker
%if %{with doc} %if %{with doc}
%package doc %package doc
@ -274,37 +267,38 @@ manager for Corosync, CMAN and/or Linux-HA.
autoreconf -fvi autoreconf -fvi
%configure \ %configure \
--disable-static \ --docdir=%{_docdir}/%{name} \
--disable-silent-rules\ --disable-static \
--without-profiling \ --disable-silent-rules \
--without-coverage \ --without-profiling \
%{!?with_cman: --without-cman} \ --without-coverage \
--without-heartbeat \ --without-cman \
--without-heartbeat \
--with-acl=true \
%if %{with_nagios} %if %{with_nagios}
--with-nagios=true \ --with-nagios=true \
%endif %endif
%if %{with_snmp}
--with-snmp=true \ --with-snmp=true \
%endif
%if %{with_esmtp} %if %{with_esmtp}
--with-esmtp=true \ --with-esmtp=true \
%endif %endif
%if %{with_acl}
--with-acl=true \
%endif
%if %{with_cibsecrets} %if %{with_cibsecrets}
--with-cibsecrets=true \ --with-cibsecrets=true \
%endif %endif
%if !%{enable_fatal_warnings} %if !%{enable_fatal_warnings}
--enable-fatal-warnings=no \ --enable-fatal-warnings=no \
%endif %endif
%{!?with doc: --with-brand=} \ %{!?with_doc: --with-brand=} \
--with-initdir=%{_initddir} \ --with-initdir=%{_initddir} \
--localstatedir=%{_var} \ --localstatedir=%{_var} \
--with-version=%{version} --with-version=%{version}-%{release}
make %{?_smp_mflags} all make %{?_smp_mflags} all
%install %install
make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} install %make_install
install -d -m755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -d -m755 %{buildroot}%{_localstatedir}/adm/fillup-templates
install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.pacemaker install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.pacemaker
@ -325,9 +319,7 @@ rm -f %{buildroot}/%{_initddir}/pacemaker
rm -f %{buildroot}/%{_initddir}/pacemaker_remote rm -f %{buildroot}/%{_initddir}/pacemaker_remote
# Don't ship fence_pcmk where it has no use # Don't ship fence_pcmk where it has no use
%if %{without cman}
rm -f %{buildroot}/%{_sbindir}/fence_pcmk rm -f %{buildroot}/%{_sbindir}/fence_pcmk
%endif
ln -s service %{buildroot}%{_sbindir}/rcpacemaker ln -s service %{buildroot}%{_sbindir}/rcpacemaker
ln -s service %{buildroot}%{_sbindir}/rcpacemaker_remote ln -s service %{buildroot}%{_sbindir}/rcpacemaker_remote
@ -412,8 +404,6 @@ fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
###########################################################
%defattr(-,root,root)
%{_sbindir}/pacemakerd %{_sbindir}/pacemakerd
%{_unitdir}/pacemaker.service %{_unitdir}/pacemaker.service
@ -426,23 +416,15 @@ fi
%{_sbindir}/crm_node %{_sbindir}/crm_node
%{_sbindir}/fence_legacy %{_sbindir}/fence_legacy
%if %{with cman}
%{_sbindir}/fence_pcmk
%endif
%{_sbindir}/stonith_admin %{_sbindir}/stonith_admin
%{_mandir}/man7/crmd.7%{ext_man} %{_mandir}/man7/crmd.7%{ext_man}
%{_mandir}/man7/pengine.7%{ext_man} %{_mandir}/man7/pengine.7%{ext_man}
%{_mandir}/man7/stonithd.7%{ext_man} %{_mandir}/man7/stonithd.7%{ext_man}
%if %{without cman}
%{_mandir}/man7/ocf_pacemaker_controld.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_controld.7%{ext_man}
%endif
%{_mandir}/man7/ocf_pacemaker_o2cb.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_o2cb.7%{ext_man}
%{_mandir}/man7/ocf_pacemaker_remote.7%{ext_man} %{_mandir}/man7/ocf_pacemaker_remote.7%{ext_man}
%{_mandir}/man8/crm_node.8%{ext_man} %{_mandir}/man8/crm_node.8%{ext_man}
%if %{with cman}
%{_mandir}/man8/fence_pcmk.8%{ext_man}
%endif
%{_mandir}/man8/fence_legacy.8%{ext_man} %{_mandir}/man8/fence_legacy.8%{ext_man}
%{_mandir}/man8/pacemakerd.8%{ext_man} %{_mandir}/man8/pacemakerd.8%{ext_man}
%{_mandir}/man8/stonith_admin.8%{ext_man} %{_mandir}/man8/stonith_admin.8%{ext_man}
@ -453,13 +435,17 @@ fi
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
%if %{without cman}
%{_libexecdir}/ocf/resource.d/pacemaker/controld %{_libexecdir}/ocf/resource.d/pacemaker/controld
%endif
%{_libexecdir}/ocf/resource.d/pacemaker/o2cb %{_libexecdir}/ocf/resource.d/pacemaker/o2cb
%{_libexecdir}/ocf/resource.d/pacemaker/remote %{_libexecdir}/ocf/resource.d/pacemaker/remote
%{_libexecdir}/ocf/resource.d/.isolation %{_libexecdir}/ocf/resource.d/.isolation
%if "%{?cs_version}" != "UNKNOWN"
%if 0%{?cs_version} < 2
%{_libexecdir}/lcrso/pacemaker.lcrso
%endif
%endif
%files cli %files cli
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker %config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker