Add internal conflicts against old versions, bump to patchset -3
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
This commit is contained in:
parent
246750c37f
commit
1a3b1adfeb
@ -8,7 +8,7 @@ URL: http://www.dogtagpki.org/
|
||||
License: GPLv2 and LGPLv2
|
||||
|
||||
Version: 10.6.8
|
||||
Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
# global _phase -a1
|
||||
|
||||
# To create a tarball from a version tag:
|
||||
@ -440,6 +440,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.
|
||||
@ -460,6 +473,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.
|
||||
@ -865,6 +891,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.
|
||||
|
||||
@ -1590,6 +1629,9 @@ fi
|
||||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Tue Dec 04 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.8-3
|
||||
- Conflict older PKI versions
|
||||
|
||||
* Tue Dec 04 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.8-2
|
||||
- Updated internal dependency versions
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user