[jpackage-utils] Make JNI directories arch independent and go back to noarch

[Stanislav Ochotnicky]

commit f3d4437a62791259dec996da34ceaa24d12911df
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Dec 11 17:38:22 2012 +0100

    Make JNI directories arch independent and go back to noarch

 jpackage-utils-jnidir.patch |   32 --------------------------------
 jpackage-utils.spec         |   12 ++++--------
 2 files changed, 4 insertions(+), 40 deletions(-)
---
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 5d7f598..9e9d903 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -36,18 +36,18 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        21%{?dist}
+Release:        22%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
 URL:            http://www.jpackage.org/
+BuildArch:      noarch
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-README
 Source2:        abs2rel.sh
 Patch1:         %{name}-own-mavendirs.patch
 Patch2:         %{name}-prefer-jre.patch
 Patch3:         %{name}-set-classpath.patch
-Patch4:         %{name}-jnidir.patch
 Patch5:         %{name}-build-classpath-symlink-fix.patch
 Patch6:         %{name}-update-maven-depmap.patch
 Group:          Utilities
@@ -73,7 +73,6 @@ information.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6
 
@@ -91,7 +90,7 @@ for dir in \
     jvmdir jvmjardir jvmprivdir \
     jvmlibdir jvmdatadir jvmsysconfdir \
     jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
-    javadir jnidir javajnidir javadocdir mavenpomdir \
+    javadir jnidir javadocdir mavenpomdir \
     mavendepmapdir mavendepmapfragdir; do
   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \
     misc/macros.jpackage | %{__awk} '{ print $2 }'))
@@ -119,7 +118,6 @@ 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}
@@ -148,9 +146,6 @@ 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}
 
@@ -217,6 +212,7 @@ EOF
 
 %changelog
 * Thu Dec 13 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-23
+- Make JNI directories arch independent and go back to noarch
 - Reimplement abs2rel.sh using perl File::Spec module
 - Reimplement %%update_maven_depmap as NOOP
 - Resolves: rhbz#882537