[Pki-devel] [PATCH] Removal of version numbers from jar file names

[Endi Sukma Dewata]

On 10/26/2012 7:06 PM, Matthew Harmsen wrote:
>   * The JNI 'symkey.jar' is a file and contains no embedded version in
>     its name

Please take a look at the following code in base/symkey/src/CMakeLists.txt:

   install(
       FILES
           ${CMAKE_BINARY_DIR}/dist/symkey.jar
       DESTINATION
           ${LIB_INSTALL_DIR}/symkey -- (A)
   )

   install(
       FILES
           ${CMAKE_BINARY_DIR}/dist/symkey.jar
       DESTINATION
           ${JAVA_LIB_INSTALL_DIR} -- (B)
   )

and in pki-core.spec:

   cd %{buildroot}%{_libdir}/symkey
   %if 0%{?fedora} >= 16
   %{__rm} %{buildroot}%{_jnidir}/symkey.jar -- (C)
   %{__mv} symkey.jar %{buildroot}%{_jnidir}/symkey.jar -- (D)
   %else
   %{__rm} symkey.jar -- (E)
   %{__ln_s} symkey-%{version}.jar symkey.jar -- (F)
   %endif

   %if 0%{?rhel} || 0%{?fedora} < 16
   cd %{buildroot}%{_jnidir}
   %{__rm} symkey.jar -- (G)
   %{__ln_s} %{_libdir}/symkey/symkey.jar symkey.jar -- (H)
   %endif

Some observations:

1. In A and B the code installs symkey.jar in /usr/lib64/symkey and 
/usr/lib64/java, respectively. In C the symkey.jar is removed from 
/usr/lib64/java. In D the symkey.jar is moved from /usr/lib64/symkey to 
/usr/lib64/java. It seems that the code in A, C, and D is not needed 
since we have B.

2. The code in E & F doesn't seem to be needed anymore since we don't 
support anything before F16.

3. The code in G & H removes the symkey.jar in /usr/lib64/java and 
replaces it with a link to symkey.jar in /usr/lib64/symkey. This is not 
necessary since we have B.

If these are correct we probably can remove everything above except B.

Other than that the patch looks good, ACK.

-- 
Endi S. Dewata