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

[kwright]

commit f855ce2bd5834bc1a2ee781a41da92aaf09ac2d7
Author: Kevin Wright <kwright at redhat.com>
Date:   Thu Oct 6 18:55:15 2011 -0700

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

 .gitignore       |    1 +
 clog             |    8 ++------
 pki-console.spec |   31 +++++++++++++++++++++++++------
 sources          |    2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aa7832c..b10368c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pki-console-1.3.2.tar.gz
 /pki-console-9.0.1.tar.gz
 /pki-console-9.0.2.tar.gz
 /pki-console-9.0.3.tar.gz
+/pki-console-9.0.5.tar.gz
diff --git a/clog b/clog
index 3cb8af9..d0d4892 100644
--- a/clog
+++ b/clog
@@ -1,6 +1,2 @@
-Bugzilla Bug #700462 - No action on clicking "Help" button of
-pkiconsole's right pane (alee)
-Bugzilla Bug #697939 - DRM signed audit log message - operation should
-be read instead of modify (jmagne)
-Bugzilla Bug #669226 - Remove Legacy Build System (mharmsen)
-Updated release of 'jss'
+Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+Bugzilla Bug #699809 - Convert CS to use systemd (alee)
diff --git a/pki-console.spec b/pki-console.spec
index beb851d..b225174 100644
--- a/pki-console.spec
+++ b/pki-console.spec
@@ -1,5 +1,5 @@
 Name:             pki-console
-Version:          9.0.3
+Version:          9.0.5
 Release:          1%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
@@ -13,18 +13,30 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake
 BuildRequires:    idm-console-framework
 BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
-BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    ldapjdk
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
+%if 0%{?fedora} >= 16
+BuildRequires:    jpackage-utils >= 1.7.5-10
+BuildRequires:    jss >= 4.2.6-19.1
+BuildRequires:    pki-util >= 9.0.15
+%else
+BuildRequires:    jpackage-utils
+BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    pki-util
+%endif
 
 Requires:         idm-console-framework
 Requires:         java >= 1:1.6.0
-Requires:         jss >= 4.2.6-17
 Requires:         ldapjdk
-Requires:         pki-console-theme
+Requires:         pki-console-theme >= 9.0.0
+%if 0%{?fedora} >= 16
+Requires:         jpackage-utils >= 1.7.5-10
+Requires:         jss >= 4.2.6-19.1
+%else
+Requires:         jpackage-utils
+Requires:         jss >= 4.2.6-17
+%endif
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
@@ -54,7 +66,7 @@ following "Mutually-Exclusive" PKI Theme packages:
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CONSOLE:BOOL=ON ..
+%cmake -DVAR_INSTALL_DIR:PATH=/var -DBUILD_PKI_CONSOLE:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} ..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -72,6 +84,13 @@ cd build
 
 
 %changelog
+* Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.5-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+
+* Wed Aug 31 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.4-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
+
 * Thu Jul 14 2011 Matthew Harmsen <mharmsen at redhat.com> 9.0.3-1
 - Bugzilla Bug #700462 - No action on clicking "Help" button of
   pkiconsole's right pane (alee)
diff --git a/sources b/sources
index 3960ccf..fea1db1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-197acba1da489b25f43448618887398b  pki-console-9.0.3.tar.gz
+2b9336f0f5318167cd653bbcff93e8db  pki-console-9.0.5.tar.gz