summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-08-18 00:40:52 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-08-29 23:42:46 -0500
commit88176c5c8caf146a1a408dc3a7f6b23e1a8e63b7 (patch)
treeb453ebb5cc5e88e42a970cdcaf6ba5e4240281ee /scripts
parent541cafdc3697bbaf8ba726be22c750ea948e14aa (diff)
downloadpki-88176c5c8caf146a1a408dc3a7f6b23e1a8e63b7.tar.gz
pki-88176c5c8caf146a1a408dc3a7f6b23e1a8e63b7.tar.xz
pki-88176c5c8caf146a1a408dc3a7f6b23e1a8e63b7.zip
Merged pki-native-tools and pki-java-tools.
The pki-native-tools and pki-java-tools have been merged into pki-tools and pki-server will depend on it. Since pki-ra and pki-tps depends on pki-server they automatically depends on pki-tools as well. Ticket #295
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_dogtag_pki5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
index 73fbf696d..ce6c02236 100755
--- a/scripts/build_dogtag_pki
+++ b/scripts/build_dogtag_pki
@@ -129,10 +129,9 @@ PKI_CONSOLE_THEME=${PKI_FLAVOR}-pki-console-theme${RPM_EXT}
# Establish PKI core package names
PKI_SETUP=pki-setup${RPM_EXT}
PKI_SYMKEY=pki-symkey${RPM_EXT}
-PKI_NATIVE_TOOLS=pki-native-tools${RPM_EXT}
PKI_BASE=pki-base${RPM_EXT}
PKI_UTIL_JAVADOC=pki-util-javadoc${RPM_EXT}
-PKI_JAVA_TOOLS=pki-java-tools${RPM_EXT}
+PKI_TOOLS=pki-tools${RPM_EXT}
PKI_JAVA_TOOLS_JAVADOC=pki-java-tools-javadoc${RPM_EXT}
PKI_SERVER=pki-server${RPM_EXT}
PKI_COMMON_JAVADOC=pki-common-javadoc${RPM_EXT}
@@ -175,7 +174,7 @@ cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}
mkdir -p ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
cp -p ${NOARCH}/*.rpm ${PKI_ARCH}/*.rpm ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SETUP} ${PKI_SYMKEY} ${PKI_NATIVE_TOOLS} ${PKI_BASE} ${PKI_UTIL_JAVADOC} ${PKI_JAVA_TOOLS} ${PKI_JAVA_TOOLS_JAVADOC} ${PKI_SERVER} ${PKI_COMMON_JAVADOC} ${PKI_SELINUX} ${PKI_CA} ${PKI_KRA} ${PKI_OCSP} ${PKI_TKS} ${PKI_SILENT}
+${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SETUP} ${PKI_SYMKEY} ${PKI_BASE} ${PKI_UTIL_JAVADOC} ${PKI_TOOLS} ${PKI_JAVA_TOOLS_JAVADOC} ${PKI_SERVER} ${PKI_COMMON_JAVADOC} ${PKI_SELINUX} ${PKI_CA} ${PKI_KRA} ${PKI_OCSP} ${PKI_TKS} ${PKI_SILENT}
# Compose and install 'pki-ra' packages
cd ${PKI_PWD}