[tomcatjss/f15] Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen) Bugzilla Bug #699809 -

[kwright]

commit e902c69005ef3bba6f7e0bda31e3752ff43e9958
Author: Kevin Wright <kwright at redhat.com>
Date:   Thu Oct 6 16:43:12 2011 -0700

    Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
    Bugzilla Bug #699809 - Convert CS to use systemd (alee)

 .gitignore     |    1 +
 clog           |    6 ++----
 sources        |    2 +-
 tomcatjss.spec |   40 +++++++++++++++++++++++++++++++++-------
 4 files changed, 37 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9025377..45ad5fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-2.0.0.tar.gz
 /tomcatjss-2.1.1.tar.gz
 /tomcatjss-6.0.0.tar.gz
+/tomcatjss-6.0.2.tar.gz
diff --git a/clog b/clog
index fbc2558..d0d4892 100644
--- a/clog
+++ b/clog
@@ -1,4 +1,2 @@
-Bugzilla Bug #702716 - rhcs80 cannot do client auth with pkiconsole
-(ok with 7.3) (jmagne)
-Require "jss >= 4.2.6-17" as a build and runtime requirement
-Bump version 2.1.1 --> 6.0.0 (to better coincide with tomcat6)
+Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+Bugzilla Bug #699809 - Convert CS to use systemd (alee)
diff --git a/sources b/sources
index dc6bef8..3656d16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8fd93ebf2b47c84c975d0bf90a7f5bb  tomcatjss-6.0.0.tar.gz
+0ea5166542168e7ffff47cec714cd7dc  tomcatjss-6.0.2.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index f8cd5df..36738b7 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,5 +1,5 @@
 Name:     tomcatjss
-Version:  6.0.0
+Version:  6.0.2
 Release:  1%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
@@ -11,24 +11,43 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Source0:  http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
+# jpackage-utils requires versioning to meet both build and runtime requirements
+# jss requires versioning to meet both build and runtime requirements
+# tomcat6 requires versioning to meet both build and runtime requirements
 BuildRequires:    ant
 BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
+%if 0%{?fedora} >= 16
+BuildRequires:    jpackage-utils >= 0:1.7.5-10
+BuildRequires:    jss >= 4.2.6-19.1
+BuildRequires:    tomcat6 >= 6.0.32-16
+%else
 %if 0%{?fedora} >= 15
+BuildRequires:    jpackage-utils
+BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    tomcat6 >= 6.0.30-6
 %else
+BuildRequires:    jpackage-utils
+BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    tomcat6
 %endif
-BuildRequires:    jss >= 4.2.6-17
+%endif
 
 Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
+%if 0%{?fedora} >= 16
+Requires:         jpackage-utils >= 0:1.7.5-10
+Requires:         jss >= 4.2.6-19.1
+Requires:         tomcat6 >= 6.0.32-16
+%else
 %if 0%{?fedora} >= 15
+Requires:         jpackage-utils
+Requires:         jss >= 4.2.6-17
 Requires:         tomcat6 >= 6.0.30-6
 %else
+Requires:         jpackage-utils
+Requires:         jss >= 4.2.6-17
 Requires:         tomcat6
 %endif
-Requires:         jss >= 4.2.6-17
+%endif
 
 # The 'tomcatjss' package conflicts with the 'tomcat-native' package
 # because it uses an underlying NSS security model rather than the
@@ -55,8 +74,8 @@ NOTE:  The 'tomcatjss' package conflicts with the 'tomcat-native' package
 
 %build
 
-ant -f build.xml
-ant -f build.xml dist
+ant -f build.xml -Djnidir=%{_jnidir}
+ant -f build.xml -Djnidir=%{_jnidir} dist
 
 %install
 rm -rf %{buildroot}
@@ -81,6 +100,13 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
+* Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 6.0.2-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+
+* Mon Sep 12 2011 Matthew Harmsen <mharmsen at redhat.com> 6.0.1-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
+
 * Thu Jul 14 2011 Matthew Harmsen <mharmsen at redhat.com> - 6.0.0-1
 - Bugzilla Bug #702716 - rhcs80 cannot do client auth with pkiconsole
   (ok with 7.3) (jmagne)