[osutil/f16] Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .

[kwright]

commit ccbd4681bdeb499c64f725e2a4a823ddb0d2c18c
Author: Kevin Wright <kwright at redhat.com>
Date:   Tue Sep 13 00:57:58 2011 -0700

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

 clog        |    8 +-------
 osutil.spec |   21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/clog b/clog
index 36938c3..39ce8b2 100644
--- a/clog
+++ b/clog
@@ -1,7 +1 @@
-- Removed version information from NSPR and NSS build/runtime requires
-- Bugzilla Bug #638377 - Generate PKI UI components which exclude
-  a GUI interface
-- Bugzilla Bug #643206 - New CMake based build system for Dogtag
-- Bugzilla Bug #644056 - CS build contains warnings
-- Bugzilla Bug #667556 - Consolidate 'osutil' SVN source code with
-  'osutil' GIT source code
+Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
diff --git a/osutil.spec b/osutil.spec
index 82beb23..b62a42b 100644
--- a/osutil.spec
+++ b/osutil.spec
@@ -10,13 +10,21 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
+%if 0%{?fedora} >= 16
+BuildRequires:    jpackage-utils >= 0:1.7.5-10
+%else
 BuildRequires:    jpackage-utils
+%endif
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    pkgconfig
 
 Requires:         java >= 1:1.6.0
+%if 0%{?fedora} >= 16
+Requires:         jpackage-utils >= 0:1.7.5-10
+%else
 Requires:         jpackage-utils
+%endif
 Requires:         nss
 
 Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
@@ -45,7 +53,7 @@ supplies various native operating system operations to Java programs.
 %build
 %{__mkdir_p} build
 cd build
-%cmake -DBUILD_OSUTIL:BOOL=ON ..
+%cmake -DBUILD_OSUTIL:BOOL=ON -DJAVA_LIB_INSTALL_DIR=%{_jnidir} ..
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
@@ -56,11 +64,18 @@ cd build
 
 cd %{buildroot}%{_libdir}/osutil
 %{__rm} osutil.jar
+%if 0%{?fedora} >= 16
+%{__rm} %{buildroot}%{_jnidir}/osutil.jar
+%{__mv} osutil-%{version}.jar %{buildroot}%{_jnidir}/osutil.jar
+%else
 %{__ln_s} osutil-%{version}.jar osutil.jar
+%endif
 
+%if 0%{?rhel} || 0%{?fedora} < 16
 cd %{buildroot}%{_jnidir}
 %{__rm} osutil.jar
 %{__ln_s} %{_libdir}/osutil/osutil.jar osutil.jar
+%endif
 
 
 %files
@@ -71,8 +86,8 @@ cd %{buildroot}%{_jnidir}
 
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Aug 31 2011 Matthew Harmsen <mharmsen at redhat.com> 2.0.1-2
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
 
 * Fri Jan 21 2011 Matthew Harmsen <mharmsen at redhat.com> 2.0.1-1
 - Removed version information from NSPR and NSS build/runtime requires