Merge pull request #534 from dwhjames/topic/rpm-autoreqprov

Fix and improve docs for rpmAutoreq and rpmAutoprov
sbt · Mar 29, 2015 · 8b043cd · 8b043cd
2 parents a22bf58 + 05696a4
commit 8b043cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/rpm/Keys.scala b/src/main/scala/com/typesafe/sbt/packager/rpm/Keys.scala
@@ -28,8 +28,8 @@ trait RpmKeys {
   val rpmDescription = SettingKey[RpmDescription]("rpm-description", "Description of this rpm.")
 
   // DEPENDENCIES
-  val rpmAutoprov = SettingKey[String]("rpm-autoprov", "enable/deactivating auto provisioning.")
-  val rpmAutoreq = SettingKey[String]("rpm-autoreq", "enable/deactivating auto requiering.")
+  val rpmAutoprov = SettingKey[String]("rpm-autoprov", "enable/disable automatic processing of 'provides' (\"yes\"/\"no\").")
+  val rpmAutoreq = SettingKey[String]("rpm-autoreq", "enable/disable automatic processing of requirements (\"yes\"/\"no\").")
   val rpmProvides = SettingKey[Seq[String]]("rpm-provides", "Packages this RPM provides.")
   val rpmRequirements = SettingKey[Seq[String]]("rpm-requirements", "Packages this RPM requires.")
   val rpmPrerequisites = SettingKey[Seq[String]]("rpm-prerequisites", "Packages this RPM need *before* installation.")

diff --git a/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala b/src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala
@@ -184,10 +184,8 @@ case class RpmSpec(
 
     sb append deps.contents
 
-    // TODO - autoprov + autoreq
-
-    sb append ("autoprov: %s\n" format meta.autoprov)
-    sb append ("autoreq: %s\n" format meta.autoreq)
+    sb append ("AutoProv: %s\n" format meta.autoprov)
+    sb append ("AutoReq: %s\n" format meta.autoreq)
 
     sb append ("BuildRoot: %s\n" format rpmRoot.getAbsolutePath)
     sb append ("BuildArch: %s\n\n" format meta.arch)

diff --git a/src/sphinx/formats/rpm.rst b/src/sphinx/formats/rpm.rst
@@ -133,9 +133,19 @@ Informational Settings
 Dependency Settings
 ~~~~~~~~~~~~~~~~~~~
 
+  ``rpmAutoreq``
+    Enable or disable the automatic processing of required packages.
+    Takes the form ``"yes"`` or ``"no"``, defaults to ``"yes"``.
+    Defines the ``AutoReq:`` tag in the spec file.
+
   ``rpmRequirements``
     The RPM packages that are required to be installed for this RPM to work.
-
+
+  ``rpmAutoprov``
+    Enable or disable the automatic processing of provided packages.
+    Takes the form ``"yes"`` or ``"no"``, defaults to ``"yes"``.
+    Defines the ``AutoProv:`` tag in the spec file.
+
   ``rpmProvides``
     The RPM package names that this RPM provides.