[pki-console] Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .

[kwright]

commit 111f5f7a4ca7d0b4170fad668bf9f9de28f47e9c
Author: Kevin Wright <kwright at redhat.com>
Date:   Tue Sep 13 03:05:02 2011 -0700

    Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .

 .gitignore       |    1 +
 clog             |    7 +------
 pki-console.spec |   16 ++++++++++++++--
 sources          |    2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b82cc76..549a516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ pki-console-1.3.2.tar.gz
 /pki-console-9.0.0.tar.gz
 /pki-console-9.0.2.tar.gz
 /pki-console-9.0.3.tar.gz
+/pki-console-9.0.4.tar.gz
diff --git a/clog b/clog
index 3cb8af9..39ce8b2 100644
--- a/clog
+++ b/clog
@@ -1,6 +1 @@
-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+ . . .
diff --git a/pki-console.spec b/pki-console.spec
index beb851d..ef59bac 100644
--- a/pki-console.spec
+++ b/pki-console.spec
@@ -1,5 +1,5 @@
 Name:             pki-console
-Version:          9.0.3
+Version:          9.0.4
 Release:          1%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
@@ -13,7 +13,11 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake
 BuildRequires:    idm-console-framework
 BuildRequires:    java-devel >= 1:1.6.0
+%if 0%{?fedora} >= 16
+BuildRequires:    jpackage-utils >= 1.7.5-10
+%else
 BuildRequires:    jpackage-utils
+%endif
 BuildRequires:    jss >= 4.2.6-17
 BuildRequires:    ldapjdk
 BuildRequires:    nspr-devel
@@ -22,6 +26,11 @@ BuildRequires:    pki-util
 
 Requires:         idm-console-framework
 Requires:         java >= 1:1.6.0
+%if 0%{?fedora} >= 16
+Requires:         jpackage-utils >= 1.7.5-10
+%else
+Requires:         jpackage-utils
+%endif
 Requires:         jss >= 4.2.6-17
 Requires:         ldapjdk
 Requires:         pki-console-theme
@@ -54,7 +63,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 +81,9 @@ cd build
 
 
 %changelog
+* 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..b7d18fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-197acba1da489b25f43448618887398b  pki-console-9.0.3.tar.gz
+eaf9046b82501d7343d4b725b471d31f  pki-console-9.0.4.tar.gz