Add patch: install MOJO fix

This commit is contained in:
Mikolaj Izdebski 2013-05-17 07:24:33 +02:00
parent d46893ec60
commit 47df11f28c
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From bd88b6fbba3b251ea9b7a47488377e95e3004ab3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 17 May 2013 07:19:54 +0200
Subject: [PATCH] Install MOJO fix
Don't attempt to install packages whict are not installable.
---
.../java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
index 0047366..39e11d5 100644
--- a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
@@ -137,7 +137,8 @@ public class InstallMojo
packages.put( packageName, pkg );
}
- installProject( project, pkg, rule );
+ if ( pkg.isInstallable() )
+ installProject( project, pkg, rule );
}
Path installRoot = Paths.get( settings.getInstallRoot() );
--
1.8.1.4

View File

@ -1,12 +1,15 @@
Name: xmvn Name: xmvn
Version: 0.4.2 Version: 0.4.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Local Extensions for Apache Maven Summary: Local Extensions for Apache Maven
License: ASL 2.0 License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn URL: http://mizdebsk.fedorapeople.org/xmvn
BuildArch: noarch BuildArch: noarch
Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
Source1: %{name}-classworlds.conf Source1: %{name}-classworlds.conf
# Backported upstream fix, will be available in 0.5.0
# https://github.com/mizdebsk/xmvn/commit/76f2d25c2b6ca4233bda9f5f9c8c8120d3164086
Patch0001: 0001-Install-MOJO-fix.patch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: beust-jcommander BuildRequires: beust-jcommander
@ -41,6 +44,7 @@ This package provides %{summary}.
%prep %prep
%setup -q %setup -q
%patch0001 -p1
# Add cglib test dependency as a workaround for rhbz#911365 # Add cglib test dependency as a workaround for rhbz#911365
%pom_xpath_inject pom:project "<dependencies/>" %pom_xpath_inject pom:project "<dependencies/>"
%pom_add_dep cglib:cglib::test %pom_add_dep cglib:cglib::test
@ -83,6 +87,9 @@ EOF
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Fri May 17 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.4.2-3
- Add patch: install MOJO fix
* Wed Apr 17 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.4.2-2 * Wed Apr 17 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.4.2-2
- Update plexus-containers-container-default JAR location - Update plexus-containers-container-default JAR location