Alex Collins edited a comment on Bug MRPM-98

Me and a bottle of Chablis have created a patch:

alex-collinss-macbook:rpm-maven-plugin alexec$ svn di
Index: src/main/java/org/codehaus/mojo/rpm/RPMHelper.java
===================================================================
— src/main/java/org/codehaus/mojo/rpm/RPMHelper.java (revision 17832)
+++ src/main/java/org/codehaus/mojo/rpm/RPMHelper.java (working copy)
@@ -19,16 +19,16 @@

  • under the License.
    */

-import java.io.File;
-
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.StreamConsumer;
-import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;

+import java.io.File;
+
/**

  • Utility to interact with rpm and rpmbuild commands.
  • @@ -114,12 +114,12 @@
    cl.setExecutable( "rpmbuild" );
    cl.setWorkingDirectory( f.getAbsolutePath() );
    cl.createArg().setValue( "-bb" );
    + cl.createArg().setValue( "--target" );
    + cl.createArg().setValue( mojo.getTargetArch() + '' + mojo.getTargetVendor() + '' + mojo.getTargetOS() );
    cl.createArg().setValue( "--buildroot" );
    cl.createArg().setValue( mojo.getRPMBuildroot().getAbsolutePath() );
    cl.createArg().setValue( "--define" );
    cl.createArg().setValue( "_topdir " + workarea.getAbsolutePath() );

  • cl.createArg().setValue( "--target" );
  • cl.createArg().setValue( mojo.getTargetArch() + '' + mojo.getTargetVendor() + '' + mojo.getTargetOS() );

// maintain passive behavior for keyPassphrase not being present
final String keyname = mojo.getKeyname();

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email

Reply via email to