[jpackage-utils] Add javajnidir resolving to build-classpath script family

[Stanislav Ochotnicky]

commit 58df5861cdf5db80847569d617f07e0f16239187
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Jul 4 16:21:35 2011 +0200

    Add javajnidir resolving to build-classpath script family

 jpackage-utils-jnidir.patch |   14 ++++++++++++++
 jpackage-utils.spec         |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/jpackage-utils-jnidir.patch b/jpackage-utils-jnidir.patch
index 2611f59..25ecb82 100644
--- a/jpackage-utils-jnidir.patch
+++ b/jpackage-utils-jnidir.patch
@@ -1,3 +1,17 @@
+diff --git a/java-utils/java-functions b/java-utils/java-functions
+index 458b85a..d395a10 100644
+--- a/java-utils/java-functions
++++ b/java-utils/java-functions
+@@ -310,7 +310,8 @@ do_find_jar() {
+    extension=$1
+ 
+    for jardir in "$JVM_LIBDIR" "$JAVAVER_JNIDIR" "$JAVAVER_LIBDIR" \
+-                 "$JAVAAPP_LIBDIR" "$JNI_LIBDIR" "$JAVA_LIBDIR" ; do
++                 "$JAVAAPP_LIBDIR" "$JNI_LIBDIR" "$JAVA_LIBDIR" \
++                 "$JAVAJNI_LIBDIR"; do
+       if [ -d "$jardir" ] ; then
+          if [ -r "$jardir/$extension.jar" ] ; then
+             echo "$jardir/$extension.jar"
 diff --git a/misc/macros.jpackage b/misc/macros.jpackage
 index a767509..c6e1319 100644
 --- a/misc/macros.jpackage
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 7c4d361..1a99a61 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -36,7 +36,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -148,6 +148,9 @@ JAVA_LIBDIR=${_javadir}
 # Location of arch-specific jar files on the system
 JNI_LIBDIR=${_jnidir}
 
+# Location for noarch jar files using arch-specifics jar files
+JAVAJNI_LIBDIR=${_javajnidir}
+
 # Root of all JVM installations
 JVM_ROOT=${_jvmdir}
 
@@ -233,6 +236,9 @@ EOF
 
 
 %changelog
+* Mon Jul  4 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-10
+- Add javajnidir resolving to build-classpath script family
+
 * Mon Jul  4 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-9
 - Change jnidir to libdir/java (see #665576)
 - Add javajnidir macro definition