From b080a90c32ffa6a1c21c2cf5ec44b44640fc01f3 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Dec 04 2018 18:33:32 +0000 Subject: Add conflicts against other package versions Signed-off-by: Alexander Scheel --- diff --git a/pki-core.spec b/pki-core.spec index 025e712..7c28020 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -447,6 +447,19 @@ Requires: jss >= 4.5.0-1 %endif Requires: nss >= 3.36.1 +# Ensure we end up with a useful installation +Conflicts: pki-base < %{version}-%{release} +Conflicts: pki-symkey < %{version}-%release} +Conflicts: pki-server < %{version}-%release} +Conflicts: pki-ca < %{version}-%release} +Conflicts: pki-kra < %{version}-%release} +Conflicts: pki-ocsp < %{version}-%release} +Conflicts: pki-tks < %{version}-%release} +Conflicts: pki-tps < %{version}-%release} +Conflicts: pki-javadoc < %{version}-%release} +Conflicts: pki-console < %{version}-%release} +Conflicts: dogtag-pki < %{version}-%release} + %description -n pki-symkey The PKI Symmetric Key Java Package supplies various native symmetric key operations to Java programs. @@ -467,6 +480,19 @@ Requires: python2-pki = %{version}-%{release} Requires(post): python2-pki = %{version}-%{release} %endif # with_python3_default +# Ensure we end up with a useful installation +Conflicts: pki-base < %{version}-%{release} +Conflicts: pki-symkey < %{version}-%release} +Conflicts: pki-server < %{version}-%release} +Conflicts: pki-ca < %{version}-%release} +Conflicts: pki-kra < %{version}-%release} +Conflicts: pki-ocsp < %{version}-%release} +Conflicts: pki-tks < %{version}-%release} +Conflicts: pki-tps < %{version}-%release} +Conflicts: pki-javadoc < %{version}-%release} +Conflicts: pki-console < %{version}-%release} +Conflicts: dogtag-pki < %{version}-%release} + %description -n pki-base The PKI Base Package contains the common and client libraries and utilities written in Python. @@ -872,6 +898,19 @@ smart card. Summary: PKI Javadoc Package BuildArch: noarch +# Ensure we end up with a useful installation +Conflicts: pki-base < %{version}-%{release} +Conflicts: pki-symkey < %{version}-%release} +Conflicts: pki-server < %{version}-%release} +Conflicts: pki-ca < %{version}-%release} +Conflicts: pki-kra < %{version}-%release} +Conflicts: pki-ocsp < %{version}-%release} +Conflicts: pki-tks < %{version}-%release} +Conflicts: pki-tps < %{version}-%release} +Conflicts: pki-javadoc < %{version}-%release} +Conflicts: pki-console < %{version}-%release} +Conflicts: dogtag-pki < %{version}-%release} + %description -n pki-javadoc This package contains PKI API documentation.