Bugzilla Bug #690950 - Update Dogtag Packages for Fedora 15 (beta)

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1931 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

6 files changed, 40 insertions, 13 deletions

diff --git a/pki/specs/dogtag-pki.spec b/pki/specs/dogtag-pki.spec
index 55b0d9dd4..1f3e8507b 100644
--- a/pki/specs/dogtag-pki.spec
+++ b/pki/specs/dogtag-pki.spec
@@ -1,7 +1,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 Version:          9.0.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -13,7 +13,11 @@ BuildArch:        noarch
 # of ALL top-level Dogtag PKI support packages
 Requires:         jss >= 4.2.6-15
 Requires:         osutil >= 2.0.0
-Requires:         tomcatjss >= 2.0.0
+%if 0%{?fedora} >= 15
+BuildRequires:    tomcatjss >= 2.1.1
+%else
+BuildRequires:    tomcatjss >= 2.0.0
+%endif
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support javadocs
@@ -135,5 +139,10 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Fri Mar 25 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-2
+- Bugzilla Bug #690950 - Update Dogtag Packages for Fedora 15 (beta)
+- Require "tomcatjss >= 2.1.1" as a build and runtime requirement
+  for Fedora 15 and later platforms
+
 * Wed Mar 23 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
 - Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/specs/pki-console.spec b/pki/specs/pki-console.spec
index b40b700b3..1f279e248 100644
--- a/pki/specs/pki-console.spec
+++ b/pki/specs/pki-console.spec
@@ -1,5 +1,5 @@
 Name:             pki-console
-Version:          9.0.1
+Version:          9.0.2
 Release:          1%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
@@ -14,7 +14,7 @@ BuildRequires:    cmake
 BuildRequires:    idm-console-framework
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-12
+BuildRequires:    jss >= 4.2.6-15
 BuildRequires:    ldapjdk
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -22,7 +22,7 @@ BuildRequires:    pki-util
 
 Requires:         idm-console-framework
 Requires:         java >= 1:1.6.0
-Requires:         jss >= 4.2.6-12
+Requires:         jss >= 4.2.6-15
 Requires:         ldapjdk
 Requires:         pki-console-theme
 
@@ -72,6 +72,10 @@ cd build
 
 
 %changelog
+* Fri Mar 25 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.2-1
+- Bugzilla Bug #690950 - Update Dogtag Packages for Fedora 15 (beta)
+- Require "jss >= 4.2.6-15" as a build and runtime requirement
+
 * Thu Mar 17 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1
 - Bugzilla Bug #688763 - Rebase updated Dogtag Packages for Fedora 15 (alpha)
 - Bugzilla Bug #676682 - REGRESSION: Restore missing 'gif' files
diff --git a/pki/specs/pki-core.spec b/pki/specs/pki-core.spec
index c7aee65c4..156247814 100644
--- a/pki/specs/pki-core.spec
+++ b/pki/specs/pki-core.spec
@@ -15,7 +15,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-12
+BuildRequires:    jss >= 4.2.6-15
 BuildRequires:    ldapjdk
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -24,7 +24,11 @@ BuildRequires:    osutil
 BuildRequires:    pkgconfig
 BuildRequires:    policycoreutils
 BuildRequires:    selinux-policy-devel
+%if 0%{?fedora} >= 15
+BuildRequires:    tomcatjss >= 2.1.1
+%else
 BuildRequires:    tomcatjss >= 2.0.0
+%endif
 BuildRequires:    velocity
 BuildRequires:    xalan-j2
 BuildRequires:    xerces-j2
@@ -117,7 +121,7 @@ Group:            System Environment/Libraries
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
-Requires:         jss >= 4.2.6-12
+Requires:         jss >= 4.2.6-15
 Requires:         nss
 
 Provides:         symkey = %{version}-%{release}
@@ -158,7 +162,7 @@ BuildArch:        noarch
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
-Requires:         jss >= 4.2.6-12
+Requires:         jss >= 4.2.6-15
 Requires:         ldapjdk
 
 %description -n   pki-util
@@ -242,13 +246,17 @@ Requires:         jakarta-commons-lang
 Requires:         jakarta-commons-logging
 %endif
 Requires:         java >= 1:1.6.0
-Requires:         jss >= 4.2.6-12
+Requires:         jss >= 4.2.6-15
 Requires:         osutil
 Requires:         pki-common-theme >= 9.0.0
 Requires:         pki-java-tools = %{version}-%{release}
 Requires:         pki-setup = %{version}-%{release}
 Requires:         pki-symkey = %{version}-%{release}
-Requires:         tomcatjss >= 2.0.0
+%if 0%{?fedora} >= 15
+BuildRequires:    tomcatjss >= 2.1.1
+%else
+BuildRequires:    tomcatjss >= 2.0.0
+%endif
 Requires:         %{_javadir}/ldapjdk.jar
 Requires:         %{_javadir}/velocity.jar
 Requires:         %{_javadir}/xalan-j2.jar
@@ -594,6 +602,9 @@ fi
 %changelog
 * Fri Mar 25 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.5-1
 - Bugzilla Bug #690950 - Update Dogtag Packages for Fedora 15 (beta)
+- Require "jss >= 4.2.6-15" as a build and runtime requirement
+- Require "tomcatjss >= 2.1.1" as a build and runtime requirement
+  for Fedora 15 and later platforms
 - 'pki-setup'
 -     Bugzilla Bug #688287 - Add "deprecation" notice regarding using
       "shared ports" in pkicreate -help . . .
diff --git a/pki/specs/pki-kra.spec b/pki/specs/pki-kra.spec
index f66056dfa..4987f24ec 100644
--- a/pki/specs/pki-kra.spec
+++ b/pki/specs/pki-kra.spec
@@ -13,7 +13,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-12
+BuildRequires:    jss >= 4.2.6-15
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    pki-common
@@ -164,6 +164,7 @@ fi
 - Bugzilla Bug #683581 - CA configuration with ECC(Default
   EC curve-nistp521) CA fails with 'signing operation failed'
 - Bugzilla Bug #684381 - CS.cfg specifies incorrect type of comments
+- Require "jss >= 4.2.6-15" as a build and runtime requirement
 
 * Thu Mar 17 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1
 - Bugzilla Bug #688763 - Rebase updated Dogtag Packages for Fedora 15 (alpha)
diff --git a/pki/specs/pki-ocsp.spec b/pki/specs/pki-ocsp.spec
index c4575b777..7c7b7e462 100644
--- a/pki/specs/pki-ocsp.spec
+++ b/pki/specs/pki-ocsp.spec
@@ -13,7 +13,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-12
+BuildRequires:    jss >= 4.2.6-15
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    pki-common
@@ -171,6 +171,7 @@ fi
 - Bugzilla Bug #683581 - CA configuration with ECC(Default
   EC curve-nistp521) CA fails with 'signing operation failed'
 - Bugzilla Bug #684381 - CS.cfg specifies incorrect type of comments
+- Require "jss >= 4.2.6-15" as a build and runtime requirement
 
 * Wed Dec 1 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
 - Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0
diff --git a/pki/specs/pki-tks.spec b/pki/specs/pki-tks.spec
index 6e651abe2..292adde32 100644
--- a/pki/specs/pki-tks.spec
+++ b/pki/specs/pki-tks.spec
@@ -13,7 +13,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-12
+BuildRequires:    jss >= 4.2.6-15
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    pki-common
@@ -165,6 +165,7 @@ fi
 - Bugzilla Bug #683581 - CA configuration with ECC(Default
   EC curve-nistp521) CA fails with 'signing operation failed'
 - Bugzilla Bug #684381 - CS.cfg specifies incorrect type of comments
+- Require "jss >= 4.2.6-15" as a build and runtime requirement
 
 * Wed Dec 1 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
 - Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0