From 21e5f54ec9606fc95a61212e5a703eca047405e6 Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Tue, 23 Oct 2012 16:58:26 -0400
Subject: [PATCH] Resolves Dogtag Trac Ticket 201 - move pki-selinux policy
 into base policy

---
 dogtag-pki.spec | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index bf05d89..0f09305 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -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