sbt#1178 update rpmEpoch to use an option

Author: Ty Coghlan

integration-tests-ansible/test-project-play-rpm/packaging.sbt

@@ -29,4 +29,4 @@ rpmVendor := "DemoVendor"
 
 rpmLicense := Some("Apache-2.0")
 
-rpmEpoch := 1
+rpmEpoch := Some(1)

src/main/scala/com/typesafe/sbt/packager/rpm/Keys.scala

@@ -21,7 +21,7 @@ trait RpmKeys {
   // DESCRIPTION KEYS
   // TODO - Summary and license are required.
   val rpmLicense = SettingKey[Option[String]]("rpm-license", "License of the code within the RPM.")
-  val rpmEpoch = SettingKey[Int]("rpm-epoch", "Epoch of the generated RPM.")
+  val rpmEpoch = SettingKey[Option[Int]]("rpm-epoch", "Epoch of the generated RPM.")
   val rpmDistribution = SettingKey[Option[String]]("rpm-distribution")
   val rpmUrl =
     SettingKey[Option[String]]("rpm-url", "Url to include in the RPM.")

src/main/scala/com/typesafe/sbt/packager/rpm/RpmMetadata.scala

@@ -19,7 +19,7 @@ case class RpmMetadata(name: String,
                        description: String,
                        autoprov: String,
                        autoreq: String,
-                       epoch: Int)
+                       epoch: Option[Int])
 
 /**
   * The Description used to generate an RPM
@@ -224,7 +224,9 @@ case class RpmSpec(meta: RpmMetadata,
     sb append ("Release: %s\n" format meta.release)
     sb append ("Summary: %s\n" format meta.summary)
 
-    if (meta.epoch > 0) sb append ("Epoch: %d\n" format meta.epoch)
+    meta.epoch filter(_ >= 0) foreach{ epoch =>
+      sb append ("Epoch: %d\n" format epoch)
+    }
 
     meta.prefix foreach { v =>
       sb append ("prefix: %s\n" format v)

src/main/scala/com/typesafe/sbt/packager/rpm/RpmPlugin.scala

@@ -69,7 +69,7 @@ object RpmPlugin extends AutoPlugin {
     rpmPrefix := None,
     rpmVendor := "", // TODO - Maybe pull in organization?
     rpmLicense := None,
-    rpmEpoch := 0,
+    rpmEpoch := None,
     rpmDistribution := None,
     rpmUrl := None,
     rpmGroup := None,

src/sbt-test/rpm/simple-rpm/build.sbt

@@ -21,7 +21,7 @@ rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
 
 rpmLicense := Some("BSD")
 
-rpmEpoch := 1
+rpmEpoch := Some(1)
 
 packageArchitecture in Rpm := "x86_64"