[rpms/jss] pqc: Resolves: 241295

[rpms/jss] pqc: Resolves: 241295

[rcritten]

            A new commit has been pushed.

            Repo   : rpms/jss
            Branch : pqc
            Commit : 4fd486d85c2fb820ec16f33ca1bd3defa3689bb8
            Author : rcritten <rcritten@fedoraproject.org>
            Date   : 2007-05-24T21:22:21+00:00
            Stats  : +9/-5 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/jss/c/4fd486d85c2fb820ec16f33ca1bd3defa3689bb8?branch=pqc

            Log:
            Resolves: 241295
Use the %{_jnidir} macro for JNI jar files instead of %{_javadir} per the
    jpackage spec.

---
diff --git a/jss.spec b/jss.spec
index 115ee8b..7d2449b 100644
--- a/jss.spec
+++ b/jss.spec
@@ -1,6 +1,6 @@
 Name:           jss
 Version:        4.2.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java Security Services (JSS)
 
 Group:          System Environment/Libraries
@@ -82,9 +82,9 @@ cp -p %{SOURCE3} .
 # There is no install target so we'll do it by hand
 
 # jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 mozilla/dist/xpclass.jar ${RPM_BUILD_ROOT}%{_javadir}/jss4-%{version}.jar
-pushd  $RPM_BUILD_ROOT%{_javadir}
+install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
+install -m 644 mozilla/dist/xpclass.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4-%{version}.jar
+pushd  $RPM_BUILD_ROOT%{_jnidir}
     ln -fs jss4-%{version}.jar jss4.jar
 popd
 
@@ -113,11 +113,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc mozilla/security/jss/jss.html MPL-1.1.txt gpl.txt lgpl.txt
-%{_javadir}/*
+%{_jnidir}/*
 %{_libdir}/lib*.so
 
 
 %changelog
+* Thu May 24 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-6
+- Use _jnidir macro instead of _javadir for the jar files. This will break
+  multilib installs but adheres to the jpackage spec.
+
 * Wed May 16 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-5
 - Include the 3 license files
 - Remove Requires for nss and nspr. These libraries have versioned symbols