Support local depmaps

This commit is contained in:
Mikolaj Izdebski 2013-02-15 13:54:56 +01:00
parent 7417026979
commit 1341320e2a
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 6f84d5f5b66ac69cc356a0c8a7bdd4d51b70d196 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 15 Feb 2013 13:53:42 +0100
Subject: [PATCH] Support local depmaps
---
scripts/mvn-rpmbuild | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/scripts/mvn-rpmbuild b/scripts/mvn-rpmbuild
index 9659c3c..39a0c9e 100755
--- a/scripts/mvn-rpmbuild
+++ b/scripts/mvn-rpmbuild
@@ -40,6 +40,15 @@ export TYCHO_MVN_RPMBUILD=true
unset TYCHO_MVN_LOCAL
export TYCHO_MVN_LOCAL
+# Support local depmaps
+XMVN_RESOLV_DEPMAPS=,
+for arg in "$@"; do
+ if egrep -q '^-Dmaven\.local\.depmap\.file=' <<<"$arg"; then
+ XMVN_RESOLV_DEPMAPS="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg")
+ fi
+done
+export XMVN_RESOLV_DEPMAPS
+
# Install maven metadata for plugins in groups org.apache.maven.plugins
# and org.codehaus.mojo. This is to allow plugins in these groups to be
# used without giving groupId prefix.
--
1.8.1.2

View File

@ -1,11 +1,12 @@
Name: javapackages-tools
Version: 0.11.2
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
Patch0001: 0001-Support-local-depmaps.patch
BuildArch: noarch
BuildRequires: jpackage-utils
@ -52,6 +53,7 @@ This package provides macros and scripts to support packaging Maven artifacts.
%prep
%setup -q -n javapackages-%{version}
%patch1 -p1
%build
@ -121,6 +123,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
%changelog
* Fri Feb 15 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.11.2-6
- Support local depmaps
* Thu Feb 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.11.2-5
- Add some maven-local Requires for convenience