Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and improve docs for rpmAutoreq and rpmAutoprov #534

Merged
merged 1 commit into from
Mar 29, 2015
Merged

Fix and improve docs for rpmAutoreq and rpmAutoprov #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scala/com/typesafe/sbt/packager/rpm/Keys.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
6 changes: 2 additions & 4 deletions src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 11 additions & 1 deletion src/sphinx/formats/rpm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,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.

Expand Down