diff --git a/jss.spec b/jss.spec index 649efa4..f2b1785 100644 --- a/jss.spec +++ b/jss.spec @@ -1,6 +1,6 @@ Name: jss Version: 4.2.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java Security Services (JSS) Group: System Environment/Libraries @@ -107,11 +107,12 @@ cp -p %{SOURCE3} . # There is no install target so we'll do it by hand # jars +install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/jss +install -m 644 mozilla/dist/xpclass.jar ${RPM_BUILD_ROOT}%{_libdir}/jss/jss4-%{version}.jar +ln -fs jss4-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/jss/jss4.jar + 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 +ln -fs %{_libdir}/jss/jss4.jar $RPM_BUILD_ROOT%{_jnidir}/jss4.jar # We have to use the name libjss4.so because this is dynamically # loaded by the jar file. @@ -142,8 +143,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc mozilla/security/jss/jss.html MPL-1.1.txt gpl.txt lgpl.txt +%{_libdir}/jss/* %{_jnidir}/* -%{_libdir}/jss/lib*.so %files javadoc %defattr(-,root,root,-) @@ -152,6 +153,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 16 2010 John Dennis - 4.2.6-10 +- move jar location to %%{_libdir}/jss and provide symlinks, on 32bit looks like this: + /usr/lib/java/jss4.jar -> /usr/lib/jss/jss4.jar + /usr/lib/jss/jss4-.jar + /usr/lib/jss/jss4.jar -> jss4-.jar + /usr/lib/jss/libjss4.so + * Mon Dec 6 2010 John Dennis - 4.2.6-9 - Resolves: bug 654657 - Incorrect socket accept error message due to bad pointer arithmetic @@ -193,9 +201,9 @@ rm -rf $RPM_BUILD_ROOT CA ECC Signing Key Failure - Resolves: bug 502111 - Need JSS interface for NSS's PK11_GenerateKeyPairWithOpFlags() function -- Resolves: bug 503809 - +- Resolves: bug 503809 - Update JSS version to 4.2.6 -- Resolves: bug 503817 - +- Resolves: bug 503817 - Create JSS Javadocs as their own RPM * Wed Feb 25 2009 Fedora Release Engineering - 4.2.5-4