PKI Deployment Scriptlets

* TRAC Ticket #266 - for non-master CA subsystems, pkidestroy needs to
  contact the security domain to update the domain
* Made Fedora 17 rely upon tomcatjss 7.0.0 or later
* Changed Dogtag 10 build-time and runtime requirements for 'pki-deploy'
* Altered PKI Package Dependency Chain (top-to-bottom):
  pki-ca, pki-kra, pki-ocsp, pki-tks --> pki-deploy --> pki-common
* Changed TPS to require a build-time dependency of 'httpd-devel >= 2.4.2'
* Clarified RPM build script's usage message

1 files changed, 14 insertions, 12 deletions

diff --git a/scripts/compose_functions b/scripts/compose_functions
index 028a64a19..a6a8ed5b6 100644
--- a/scripts/compose_functions
+++ b/scripts/compose_functions
@@ -72,37 +72,39 @@ Usage()
 	printf "Usage:  $0 [options] <target>\n\n"
 	printf "        where <target> is one of the following:\n\n"
 	printf "            srpm         - copies a spec file from local source,\n"
-	printf "                           generates a tarball from local source, "
-	printf "and\n"
+	printf "                           generates a tarball from local source,\n"
+	printf "                           copies any relevant patches from the\n"
+	printf "                           local 'patches' directory, and\n"
 	printf "                           produces an SRPM\n"
 	printf "                           [suitable for use by 'mock']\n\n"
 	printf "            rpms         - copies a spec file from local source,\n"
-	printf "                           generates a tarball from local source, "
-	printf "and\n"
+	printf "                           generates a tarball from local source,\n"
+	printf "                           copies any relevant patches from the\n"
+	printf "                           local 'patches' directory, and\n"
 	printf "                           produces an SRPM and one or more RPMS\n"
 	printf "                           ${MESSAGE}\n\n"
 	printf "            hybrid_srpm  - copies a spec file from local source,\n"
 	printf "                           generates a tarball from local source,\n"
-	printf "                           fetches patches from the spec's URL, "
-	printf "and\n"
+	printf "                           fetches any relevant patches from the\n"
+	printf "                           spec's URL, and\n"
 	printf "                           produces an SRPM\n"
 	printf "                           [suitable for use by 'mock']\n\n"
 	printf "            hybrid_rpms  - copies a spec file from local source,\n"
 	printf "                           generates a tarball from local source,\n"
-	printf "                           fetches all patches from the spec's URL,"
-	printf " and\n"
+	printf "                           fetches any relevant patches from the\n"
+	printf "                           spec's URL, and\n"
 	printf "                           produces an SRPM and one or more RPMS\n"
 	printf "                           ${MESSAGE}\n\n"
 	printf "            patched_srpm - copies a spec file from local source,\n"
 	printf "                           fetches a tarball from the spec's URL,\n"
-	printf "                           fetches all patches from the spec's URL,"
-	printf " and\n"
+	printf "                           fetches any relevant patches from the\n"
+	printf "                           spec's URL, and\n"
 	printf "                           produces an SRPM\n"
 	printf "                           [suitable for use by 'mock']\n\n"
 	printf "            patched_rpms - copies a spec file from local source,\n"
 	printf "                           fetches a tarball from the spec's URL,\n"
-	printf "                           fetches all patches from the spec's URL,"
-	printf " and\n"
+	printf "                           fetches any relevant patches from the\n"
+	printf "                           spec's URL, and\n"
 	printf "                           produces an SRPM and one or more RPMS\n"
 	printf "                           ${MESSAGE}\n\n"
 	printf "Options:\n"