diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/RpmSpecificSettings.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/RpmSpecificSettings.java index 234d2ae5..d1c5920d 100644 --- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/RpmSpecificSettings.java +++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/plugin/RpmSpecificSettings.java @@ -38,6 +38,8 @@ public class RpmSpecificSettings public Option rpmbuild = none(); + public List defineStatements = List.nil(); + public void setGroup( String group ) { this.group = fromNull( group ); @@ -48,6 +50,17 @@ public void setRpmbuild( String rpmbuild ) this.rpmbuild = fromNull( rpmbuild ); } + public void setDefineStatements(java.util.List statements) + { + if (statements == null) + return; + for (String s : statements) + { + defineStatements = defineStatements.snoc(s); + } + defineStatements = defineStatements.nub(); + } + public String toString() { return ToStringBuilder.reflectionToString( this, ToStringStyle.MULTI_LINE_STYLE ); diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmMojoUtil.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmMojoUtil.java index 0d907db9..17d50c68 100644 --- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmMojoUtil.java +++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmMojoUtil.java @@ -41,6 +41,6 @@ public static RpmUnixPackage validateMojoSettingsAndApplyFormatSpecificSettingsT } return unixPackage. - rpmParameters( rpm.group.some(), rpm.rpmbuild ); + rpmParameters( rpm.group.some(), rpm.rpmbuild, rpm.defineStatements ); } } diff --git a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java index 3448e879..89450ad8 100755 --- a/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java +++ b/unix-maven-plugin/src/main/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackage.java @@ -82,10 +82,11 @@ public RpmUnixPackage parameters( PackageParameters parameters ) return this; } - public RpmUnixPackage rpmParameters( String group, Option rpmbuild ) + public RpmUnixPackage rpmParameters( String group, Option rpmbuild, List defineStatements ) { specFile.group = group; this.rpmbuild = rpmbuild; + specFile.defineStatements = defineStatements; return this; } diff --git a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java index 6b7f10b5..738dbbc3 100755 --- a/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java +++ b/unix-maven-plugin/src/test/java/org/codehaus/mojo/unix/maven/rpm/RpmUnixPackageTest.java @@ -75,7 +75,7 @@ public void testBasic() RpmUnixPackage unixPackage = packagingFormat.start( new SystemStreamLog() ). parameters( parameters ). - rpmParameters( "Fun", Option.none() ). + rpmParameters( "Fun", Option.none(), List.nil() ). workingDirectory( root.resolve( "working-directory" ) ); unixPackage.beforeAssembly( EMPTY, now ); @@ -110,7 +110,7 @@ public void testFiltering() { protected RpmUnixPackage extraStuff( RpmUnixPackage rpmUnixPackage ) { - return rpmUnixPackage.rpmParameters( "my-group", Option.none() ); + return rpmUnixPackage.rpmParameters( "my-group", Option.none(), List.nil() ); } }; unixPackageTestUtil.testFiltering();