diff --git a/0001-Install-MOJO-fix.patch b/0001-Install-MOJO-fix.patch new file mode 100644 index 0000000..35528ba --- /dev/null +++ b/0001-Install-MOJO-fix.patch @@ -0,0 +1,27 @@ +From bd88b6fbba3b251ea9b7a47488377e95e3004ab3 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/xmvn.spec b/xmvn.spec index c648769..4fe31cc 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,12 +1,15 @@ Name: xmvn Version: 0.4.2 -Release: 1%{?dist} +Release: 1.1%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn BuildArch: noarch Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz 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: beust-jcommander @@ -41,6 +44,7 @@ This package provides %{summary}. %prep %setup -q +%patch0001 -p1 # Add cglib test dependency as a workaround for rhbz#911365 %pom_xpath_inject pom:project "" %pom_add_dep cglib:cglib::test @@ -83,6 +87,9 @@ EOF %doc LICENSE NOTICE %changelog +* Fri May 17 2013 Mikolaj Izdebski - 0.4.2-1.1 +- Add patch: install MOJO fix + * Tue Apr 9 2013 Mikolaj Izdebski - 0.4.2-1 - Update to upstream version 0.4.2