diff --git a/.gitignore b/.gitignore index 83eebe8..2a441e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/ClusterLabs-resource-agents-*.tar.gz -/resource-agents-*.src.rpm +/*.tar.gz +/*.src.rpm /.build-*.log /*/ diff --git a/resource-agents.spec b/resource-agents.spec index eb4ad50..fae165a 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.8.0 -Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -262,6 +262,14 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %endif %{_mandir}/man7/*.7* + +### +# Moved to separate packages +### +%exclude /usr/lib/ocf/resource.d/heartbeat/SAP* +%exclude /usr/lib/ocf/lib/heartbeat/sap* +%exclude %{_mandir}/man7/*SAP* + ### # Unsupported ### @@ -414,6 +422,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %changelog +* Tue Jun 29 2021 Oyvind Albrigtsen - 4.8.0-5 +- Exclude SAP agents that are in separate -sap subpackage + + Resolves: rhbz#1977208 + * Wed Jun 2 2021 Oyvind Albrigtsen - 4.8.0-4 - pgsqlms: new resource agent