summaryrefslogtreecommitdiffstats
path: root/pki/scripts/compose_pki_tks_packages
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-12 01:54:34 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-12 01:54:34 +0000
commita3f79f73e3a3ab5fe2403db86e4f9be3b78e20f4 (patch)
treeaee9261a291289344cee99a4706679b2cc66e4a8 /pki/scripts/compose_pki_tks_packages
parent57d529cce8f005d2ca98681f4e2df1008ef6130d (diff)
downloadpki-a3f79f73e3a3ab5fe2403db86e4f9be3b78e20f4.tar.gz
pki-a3f79f73e3a3ab5fe2403db86e4f9be3b78e20f4.tar.xz
pki-a3f79f73e3a3ab5fe2403db86e4f9be3b78e20f4.zip
Bugzilla Bug #665777 - cmake based builds should have option to produce tar and SRPM only
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1724 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/scripts/compose_pki_tks_packages')
-rwxr-xr-xpki/scripts/compose_pki_tks_packages10
1 files changed, 9 insertions, 1 deletions
diff --git a/pki/scripts/compose_pki_tks_packages b/pki/scripts/compose_pki_tks_packages
index e71660ae..39a539d1 100755
--- a/pki/scripts/compose_pki_tks_packages
+++ b/pki/scripts/compose_pki_tks_packages
@@ -4,6 +4,14 @@
# All rights reserved.
# END COPYRIGHT BLOCK
+##
+## Include common 'compose' functions
+##
+
+COMPOSE_PWD=`dirname $0`
+source ${COMPOSE_PWD}/compose_functions
+
+
## Always switch into the base directory three levels
## above this shell script prior to executing it so
## that all of its output is written to this directory
@@ -53,7 +61,7 @@ PKI_TKS_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
PKI_TKS_TARBALL="${PKI_TKS}-${PKI_TKS_VERSION}.tar.gz"
PKI_TKS_SPEC_FILE="${PKI_TKS_SPECS_DIR}/${PKI_TKS}.spec"
PKI_TKS_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_TKS}"
-PKI_TKS_PACKAGE_COMMAND="rpmbuild --define \"_topdir \`pwd\`\" -ba SPECS/${PKI_TKS}.spec"
+PKI_TKS_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_TKS}.spec"
PKI_TKS_STAGING_DIR="${PKI_PACKAGES}/staging"
PKI_TKS_DIR="${PKI_TKS_STAGING_DIR}/${PKI_TKS}-${PKI_TKS_VERSION}"