Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pacemaker.git#83ce149390888dd8f2ed65b5c7e43b2451c464e0
This commit is contained in:
DistroBaker 2020-12-16 22:05:14 +00:00
parent 214e49d559
commit 4bdd3d8a63
1 changed files with 11 additions and 1 deletions

View File

@ -19,7 +19,7 @@
## can be incremented to build packages reliably considered "newer" ## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion) ## than previously built packages with the same pcmkversion)
%global pcmkversion 2.0.5 %global pcmkversion 2.0.5
%global specversion 8 %global specversion 10
## Upstream commit (or git tag, such as "Pacemaker-" plus the ## Upstream commit (or git tag, such as "Pacemaker-" plus the
## {pcmkversion} macro for an official release) to use for this package ## {pcmkversion} macro for an official release) to use for this package
@ -316,6 +316,8 @@ Test framework for cluster-related technologies like Pacemaker
License: CC-BY-SA-4.0 License: CC-BY-SA-4.0
Summary: Documentation for Pacemaker Summary: Documentation for Pacemaker
BuildArch: noarch BuildArch: noarch
Conflicts: %{name}-libs > %{version}-%{release}
Conflicts: %{name}-libs < %{version}-%{release}
%description doc %description doc
Documentation for Pacemaker. Documentation for Pacemaker.
@ -717,6 +719,14 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING %license %{nagios_name}-%{nagios_hash}/COPYING
%changelog %changelog
* Mon Dec 7 2020 Klaus Wenninger <kwenning@redhat.com> - 2.0.5-10
- Conflicts of doc package introduced to fix upgrade/downgrade
issues needs to be independent from arch
* Fri Dec 4 2020 Klaus Wenninger <kwenning@redhat.com> - 2.0.5-9
- Make doc-package conflict with wrong version of libs
to fix upgrade/downgrade issues
* Fri Dec 4 2020 Klaus Wenninger <kwenning@redhat.com> - 2.0.5-8 * Fri Dec 4 2020 Klaus Wenninger <kwenning@redhat.com> - 2.0.5-8
- Update for new upstream release tarball: Pacemaker-2.0.5 - Update for new upstream release tarball: Pacemaker-2.0.5
for full details, see included ChangeLog file or for full details, see included ChangeLog file or