[jpackage-utils] Change jnidir to libdir/java (see #665576)

[Stanislav Ochotnicky]

commit d8b657c9ad346b4df8be5281f3cfd40820af6142
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Jul 4 12:32:40 2011 +0200

    Change jnidir to libdir/java (see #665576)
    
    - Add javajnidir macro definition - for noarch jars using arch jar/so files
    - Package is now architecture-specific because of _libdir use

 jpackage-utils-jnidir.patch |   20 ++++++++++++++++++++
 jpackage-utils.spec         |   17 +++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/jpackage-utils-jnidir.patch b/jpackage-utils-jnidir.patch
new file mode 100644
index 0000000..2611f59
--- /dev/null
+++ b/jpackage-utils-jnidir.patch
@@ -0,0 +1,20 @@
+diff --git a/misc/macros.jpackage b/misc/macros.jpackage
+index a767509..c6e1319 100644
+--- a/misc/macros.jpackage
++++ b/misc/macros.jpackage
+@@ -81,7 +81,14 @@
+ #   - jars for Java standard x.y.z (usually symlinks to  %{_jnidir}-ext)
+ # To simplify things only %{_jnidir} is defined.
+ #
+-%_jnidir        %{_prefix}/lib/java
++%_jnidir        %{_libdir}/java
++
++
++# 
++# Directory where architecture-independent that use
++# architecture-dependent files are placed
++#
++%_javajnidir    %{_datadir}/java-jni
+ 
+ #
+ # Root directory where all javadoc is installed. Also already in RH macros.
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index f94a49b..7c4d361 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -36,7 +36,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -50,13 +50,15 @@ Source8:        https://fedorahosted.org/released/javapackages/javapackages-%{fj
 Patch1:         %{name}-own-mavendirs.patch
 Patch2:         %{name}-prefer-jre.patch
 Patch3:         %{name}-set-classpath.patch
+Patch4:         %{name}-jnidir.patch
 Group:          Utilities
 
-BuildArch:      noarch
-
 Requires:       coreutils
 Requires:       python
 
+# for noarch->arch change
+Obsoletes:      %{name} < 0:1.7.5-9
+
 %description
 Utilities for the JPackage Project <http://www.jpackage.org/>.
 
@@ -70,6 +72,7 @@ information.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
 
@@ -87,7 +90,7 @@ for dir in \
     jvmdir jvmjardir jvmprivdir \
     jvmlibdir jvmdatadir jvmsysconfdir \
     jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
-    javadir jnidir javadocdir mavenpomdir \
+    javadir jnidir javajnidir javadocdir mavenpomdir \
     mavendepmapdir mavendepmapfragdir; do
   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \
     misc/macros.jpackage | %{__awk} '{ print $2 }'))
@@ -115,6 +118,7 @@ install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.5.0,1.6.0,1.7.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-ext
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0}
+install -dm 755 ${RPM_BUILD_ROOT}${_javajnidir}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_mavenpomdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapdir}
@@ -229,6 +233,11 @@ EOF
 
 
 %changelog
+* 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
+- Package is now architecture-specific because of _libdir use
+
 * Wed Jun 29 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-8
 - Change pom and fragment directories to /usr/share
 - Improved error handing in add_maven_depmap