Resolves Dogtag Trac Ticket 201 - move pki-selinux policy into base policy

This commit is contained in:
Ade Lee 2012-10-23 16:58:26 -04:00
parent ec5b82db76
commit 21e5f54ec9

View File

@ -8,7 +8,7 @@
Summary: Dogtag Public Key Infrastructure (PKI) Suite
Name: dogtag-pki
Version: 10.0.0
Release: %{?relprefix}10%{?prerel}%{?dist}
Release: %{?relprefix}12%{?prerel}%{?dist}
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
URL: http://pki.fedoraproject.org/
@ -28,7 +28,7 @@ BuildArch: noarch
%define pki_tks_version 10.0.0
%define pki_tps_version 10.0.0
%define pki_console_version 10.0.0
%define tomcatjss_version 7.0.0
%define tomcatjss_version 7.0.0-3
%else
%if 0%{?fedora} >= 17
%define dogtag_pki_theme_version 10.0.0
@ -41,7 +41,7 @@ BuildArch: noarch
%define pki_tks_version 10.0.0
%define pki_tps_version 10.0.0
%define pki_console_version 10.0.0
%define tomcatjss_version 7.0.0
%define tomcatjss_version 7.0.0-3
%else
%if 0%{?fedora} >= 16
%define dogtag_pki_theme_version 10.0.0
@ -98,10 +98,15 @@ Requires: dogtag-pki-tps-theme >= %{dogtag_pki_theme_version}
Requires: pki-ca >= %{pki_core_version}
Requires: pki-server >= %{pki_core_version}
Requires: pki-tools >= %{pki_core_version}
Requires: pki-selinux >= %{pki_core_version}
Requires: pki-symkey >= %{pki_core_version}
Requires: pki-base >= %{pki_core_version}
%if 0%{?fedora} <= 17
Requires: pki-selinux >= %{pki_core_version}
%else
Requires: selinux-policy-base >= 3.11.1-43
%endif
# Make certain that this 'meta' package requires the latest version(s)
# of ALL Dogtag PKI core javadocs
Requires: pki-javadoc >= %{pki_core_version}
@ -193,6 +198,12 @@ rm -rf %{buildroot}
%doc README
%changelog
* Tue Oct 23 2012 Ade Lee <alee@redhat.com> 10.0.0-0.12.b1
- Remove pki-selinux from f18 build
* Fri Oct 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.11.b1
- Update tomcatjss version
* Mon Oct 8 2012 Ade Lee <alee@redhat.com> 10.0.0-0.10.b1
- Update release to b1