summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/common/src/CMakeLists.txt33
-rw-r--r--base/deploy/src/scriptlets/pkijython.py2
-rwxr-xr-xbase/setup/pki2
-rw-r--r--specs/pki-core.spec7
4 files changed, 41 insertions, 3 deletions
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index f93083d79..fc6204b2a 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -173,6 +173,7 @@ install(
set(PKI_CERTSRV_JAR ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar CACHE INTERNAL "pki-certsrv jar file")
+
# build pki-cms
javac(pki-cms-classes
SOURCES
@@ -333,3 +334,35 @@ install(
)
set(PKI_CMSBUNDLE_JAR ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar INTERNAL "pki-cmsbundle jar file")
+
+
+# build pki-client
+jar(pki-client-jar
+ CREATE
+ ${CMAKE_BINARY_DIR}/dist/pki-client-${APPLICATION_VERSION}.jar
+ INPUT_DIR
+ ${CMAKE_BINARY_DIR}/classes
+ FILES
+ com/netscape/cms/client/*.class
+ DEPENDS
+ pki-cms
+)
+
+link(pki-client
+ SOURCE
+ ${CMAKE_BINARY_DIR}/dist/pki-client.jar
+ DEST
+ pki-client-${APPLICATION_VERSION}.jar
+ DEPENDS
+ pki-client-jar
+)
+
+install(
+ FILES
+ ${CMAKE_BINARY_DIR}/dist/pki-client.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-client-${APPLICATION_VERSION}.jar
+ DESTINATION
+ ${JAVA_JAR_INSTALL_DIR}/pki
+)
+
+set(PKI_CLIENT_JAR ${CMAKE_BINARY_DIR}/dist/pki-client.jar CACHE INTERNAL "pki-client jar file")
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py
index f9c992615..503e687d0 100644
--- a/base/deploy/src/scriptlets/pkijython.py
+++ b/base/deploy/src/scriptlets/pkijython.py
@@ -97,7 +97,7 @@ jarLoad.addFile("/usr/share/java/resteasy/resteasy-jettison-provider.jar")
jarLoad.addFile("/usr/share/java/scannotation.jar")
# PKI Jars
jarLoad.addFile("/usr/share/java/pki/pki-certsrv.jar")
-jarLoad.addFile("/usr/share/java/pki/pki-cms.jar")
+jarLoad.addFile("/usr/share/java/pki/pki-client.jar")
jarLoad.addFile("/usr/share/java/pki/pki-cmsutil.jar")
jarLoad.addFile("/usr/share/java/pki/pki-nsutil.jar")
# JSS JNI Jars
diff --git a/base/setup/pki b/base/setup/pki
index 90c863f35..598d8f310 100755
--- a/base/setup/pki
+++ b/base/setup/pki
@@ -72,7 +72,7 @@ if( $ARCHITECTURE eq "i386" ) {
###############################################################################
$ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-certsrv.jar:"
- . "/usr/share/java/${PRODUCT}/pki-cms.jar:"
+ . "/usr/share/java/${PRODUCT}/pki-client.jar:"
. "/usr/share/java/${PRODUCT}/pki-nsutil.jar:"
. "/usr/share/java/apache-commons-cli.jar:"
. "/usr/share/java/apache-commons-codec.jar:"
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 87c610c2d..5d682be87 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.0.0
-Release: %{?relprefix}21%{?prerel}%{?dist}
+Release: %{?relprefix}22%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -1260,6 +1260,8 @@ fi
%endif
%{_javadir}/pki/pki-certsrv-%{version}.jar
%{_javadir}/pki/pki-certsrv.jar
+%{_javadir}/pki/pki-client-%{version}.jar
+%{_javadir}/pki/pki-client.jar
%{_javadir}/pki/pki-cms-%{version}.jar
%{_javadir}/pki/pki-cms.jar
%{_javadir}/pki/pki-cmsbundle-%{version}.jar
@@ -1424,6 +1426,9 @@ fi
%changelog
+* Mon Aug 13 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.22.a1
+- Added pki-client.jar.
+
* Fri Jul 27 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.21.a1
- Merged pki-jndi-realm.jar into pki-cmscore.jar.