diff --git a/pacemaker.spec b/pacemaker.spec index bbdd023..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 9 +%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,8 +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%{?_isa} > %{version}-%{release} -Conflicts: %{name}-libs%{?_isa} < %{version}-%{release} +Conflicts: %{name}-libs > %{version}-%{release} +Conflicts: %{name}-libs < %{version}-%{release} %description doc Documentation for Pacemaker. @@ -719,6 +719,10 @@ 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