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

- Define with_stonithd to support legacy fencing agents
- Disable libpacemaker3-cluster package

OBS-URL: https://build.opensuse.org/request/show/184918
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=49

pacemaker.spec

@@ -38,6 +38,7 @@
 
 # Legacy stonithd fencing agents
 %bcond_with stonithd
+%define with_stonithd 1
 
 # Build with/without support for profiling tools
 %bcond_with profiling
@@ -83,6 +84,7 @@
 %define with_acl                1
 %define with_cibsecrets         1
 
+%define enable_lib_cluster_pkg  0
 %define enable_fatal_warnings   1
 
 %define with_regression_tests   0
@@ -116,7 +118,9 @@ Conflicts:      heartbeat < 3.0
 Conflicts:      libheartbeat2 < 3.0.0
 Requires:       %{name}-cli = %{version}-%{release}
 Requires:       libpacemaker3 = %{version}-%{release}
+%if %{enable_lib_cluster_pkg}
 Requires:       libpacemaker3-cluster = %{version}-%{release}
+%endif
 Requires:       python
 Requires:       resource-agents
 Recommends:     crmsh
@@ -215,7 +219,8 @@ BuildRequires:  heartbeat-devel
 Requires:       heartbeat
 %endif
 
-%if %{with stonithd}
+#%if %{with stonithd}
+%if %{with_stonithd}
 #BuildRequires:  cluster-glue-libs-devel
 BuildRequires:  libglue-devel
 %endif
@@ -288,6 +293,7 @@ manager for Corosync, CMAN and/or Linux-HA.
 The libpacemaker3 package contains shared libraries needed for cluster
 nodes and those just running the CLI tools.
 
+%if %{enable_lib_cluster_pkg}
 %package -n libpacemaker3-cluster
 Summary:        Cluster Libraries used by Pacemaker
 Group:          Productivity/Clustering/HA
@@ -299,6 +305,7 @@ manager for Corosync, CMAN and/or Linux-HA.
 
 The libpacemaker3-cluster package contains cluster-aware shared
 libraries needed for nodes that will form part of the cluster nodes.
+%endif
 
 %package remote
 Summary:        Pacemaker remote daemon for non-cluster nodes
@@ -332,7 +339,9 @@ Requires:       bzip2-devel
 
 Requires:       libcorosync-devel
 Requires:       libpacemaker3 = %{version}-%{release}
+%if %{enable_lib_cluster_pkg}
 Requires:       libpacemaker3-cluster = %{version}-%{release}
+%endif
 Requires:       libqb-devel
 Requires:       libtool-ltdl-devel
 Requires:       libuuid-devel
@@ -560,9 +569,11 @@ exit 0
 
 %postun -n libpacemaker3 -p /sbin/ldconfig
 
+%if %{enable_lib_cluster_pkg}
 %post -n libpacemaker3-cluster -p /sbin/ldconfig
 
 %postun -n libpacemaker3-cluster -p /sbin/ldconfig
+%endif
 
 %if %with_regression_tests
 
@@ -693,11 +704,13 @@ fi
 %doc AUTHORS
 %{_libdir}/libcrmcluster.so.*
 
+%if %{enable_lib_cluster_pkg}
 %files -n libpacemaker3-cluster
 %defattr(-,root,root)
 #%{_libdir}/libcrmcluster.so.*
 %doc COPYING.LIB
 %doc AUTHORS
+%endif
 
 %files remote
 %defattr(-,root,root)