rpms/jss/FC-6 jss.spec,1.1,1.2

[Robert Crittenden (rcritten)]

Author: rcritten

Update of /cvs/extras/rpms/jss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17811

Modified Files:
	jss.spec 
Log Message:
Resolves: 241295

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



Index: jss.spec
===================================================================
RCS file: /cvs/extras/rpms/jss/FC-6/jss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jss.spec	17 May 2007 14:07:17 -0000	1.1
+++ jss.spec	24 May 2007 21:20:45 -0000	1.2
@@ -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 @@
 # 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 @@
 %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 at 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 at redhat.com> 4.2.4-5
 - Include the 3 license files
 - Remove Requires for nss and nspr. These libraries have versioned symbols