From 4bdd3d8a6308be44b5f102b9bfa68097cf0677b9 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 16 Dec 2020 22:05:14 +0000 Subject: [PATCH] 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 --- pacemaker.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pacemaker.spec b/pacemaker.spec index 056493c..54c9f68 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -19,7 +19,7 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.0.5 -%global specversion 8 +%global specversion 10 ## Upstream commit (or git tag, such as "Pacemaker-" plus the ## {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 Summary: Documentation for Pacemaker BuildArch: noarch +Conflicts: %{name}-libs > %{version}-%{release} +Conflicts: %{name}-libs < %{version}-%{release} %description doc Documentation for Pacemaker. @@ -717,6 +719,14 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Mon Dec 7 2020 Klaus Wenninger - 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 - 2.0.5-9 +- Make doc-package conflict with wrong version of libs + to fix upgrade/downgrade issues + * Fri Dec 4 2020 Klaus Wenninger - 2.0.5-8 - Update for new upstream release tarball: Pacemaker-2.0.5 for full details, see included ChangeLog file or