Build with pcp-pmda support by default on Fedora

resolves: #1552276

Guenther
This commit is contained in:
Günther Deschner 2021-07-14 12:25:21 +02:00
parent 869e9c50a6
commit 15c3d6dc9d

View File

@ -106,9 +106,16 @@
#endif fedora || rhel >= 8 #endif fedora || rhel >= 8
%endif %endif
# Build the ctdb-pcp-pmda package by default on Fedora
%if 0%{?fedora}
%bcond_without pcp_pmda
%else
%bcond_with pcp_pmda
%endif
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
%global baserelease 0 %global baserelease 1
%global samba_version 4.14.6 %global samba_version 4.14.6
%global talloc_version 2.3.2 %global talloc_version 2.3.2
@ -285,6 +292,10 @@ BuildRequires: libcephfs-devel
BuildRequires: liburing-devel >= 0.4 BuildRequires: liburing-devel >= 0.4
%endif %endif
%if %{with pcp_pmda}
BuildRequires: pcp-libs-devel
%endif
%if %{with dc} || %{with testsuite} %if %{with dc} || %{with testsuite}
# Add python3-iso8601 to avoid that the # Add python3-iso8601 to avoid that the
# version in Samba is being packaged # version in Samba is being packaged
@ -961,6 +972,20 @@ and use CTDB instead.
#endif with testsuite #endif with testsuite
%endif %endif
%if %{with pcp_pmda}
%package -n ctdb-pcp-pmda
Summary: CTDB PCP pmda support
Requires: ctdb = %{version}
Requires: pcp-libs
%description -n ctdb-pcp-pmda
Performance Co-Pilot (PCP) support for CTDB
#endif with pcp_pmda
%endif
#endif with clustering #endif with clustering
%endif %endif
@ -1050,6 +1075,9 @@ export LDFLAGS="%{__global_ldflags} -fuse-ld=gold"
%endif %endif
%if %{with testsuite} %if %{with testsuite}
--enable-selftest \ --enable-selftest \
%endif
%if %{with pcp_pmda}
--enable-pmda \
%endif %endif
--with-profiling-data \ --with-profiling-data \
--with-systemd \ --with-systemd \
@ -3897,6 +3925,19 @@ fi
#endif with selftest #endif with selftest
%endif %endif
%if %{with pcp_pmda}
%files -n ctdb-pcp-pmda
%dir %{_localstatedir}/lib/pcp/pmdas/ctdb
%{_localstatedir}/lib/pcp/pmdas/ctdb/Install
%{_localstatedir}/lib/pcp/pmdas/ctdb/README
%{_localstatedir}/lib/pcp/pmdas/ctdb/Remove
%{_localstatedir}/lib/pcp/pmdas/ctdb/domain.h
%{_localstatedir}/lib/pcp/pmdas/ctdb/help
%{_localstatedir}/lib/pcp/pmdas/ctdb/pmdactdb
%{_localstatedir}/lib/pcp/pmdas/ctdb/pmns
#endif with pcp_pmda
%endif
#endif with clustering #endif with clustering
%endif %endif
@ -3908,6 +3949,10 @@ fi
%endif %endif
%changelog %changelog
* Wed Jul 14 2021 Guenther Deschner <gdeschner@redhat.com> - 4.14.6-1
- Build with pcp-pmda support by default on Fedora
- resolves: #1552276
* Tue Jul 13 2021 Guenther Deschner <gdeschner@redhat.com> - 4.14.6-0 * Tue Jul 13 2021 Guenther Deschner <gdeschner@redhat.com> - 4.14.6-0
- Update to Samba 4.14.6 - Update to Samba 4.14.6
- resolves: #1981764 - resolves: #1981764