From c711afeea6abb3c292e485d414857b72fc8499da Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 12 Mar 2013 13:51:53 +0100
Subject: [PATCH] Update to new upstream snapshot

- Create custom /usr/bin/xmvn instead of using %jpackage_script
- Mirror maven directory structure
- Add Plexus Classworlds config file
---
 sources               |  2 +-
 xmvn-classworlds.conf |  7 +++++++
 xmvn.spec             | 28 +++++++++++++++++++++++++---
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 xmvn-classworlds.conf

diff --git a/sources b/sources
index abe9ab3..70a7ce6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55795cead4a880379a3e425f1852e739  xmvn-snapshot.tar.xz
+7aeb9f9183b1112379500a9d8ecf8411  xmvn-snapshot.tar.xz
diff --git a/xmvn-classworlds.conf b/xmvn-classworlds.conf
new file mode 100644
index 0000000..3b899b1
--- /dev/null
+++ b/xmvn-classworlds.conf
@@ -0,0 +1,7 @@
+main is org.fedoraproject.maven.connector.Main from plexus.core
+
+[plexus.core]
+optionally ${maven.home}/lib/ext/*.jar
+load       ${maven.home}/lib/*.jar
+optionally ${maven.home}/lib/maven/ext/*.jar
+load       ${maven.home}/lib/maven/*.jar
diff --git a/xmvn.spec b/xmvn.spec
index 6d098ac..927c8bd 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -1,11 +1,12 @@
 Name:           xmvn
 Version:        0.4.0
-Release:        0.2%{?dist}
+Release:        0.3%{?dist}
 Summary:        Local Extensions for Apache Maven
 License:        ASL 2.0
 URL:            http://mizdebsk.fedorapeople.org/xmvn
 BuildArch:      noarch
 Source0:        http://mizdebsk.fedorapeople.org/%{name}/%{name}-snapshot.tar.xz
+Source1:        %{name}-classworlds.conf
 
 BuildRequires:  maven-local
 BuildRequires:  beust-jcommander
@@ -44,17 +45,32 @@ This package provides %{summary}.
 
 %build
 %mvn_file ":{xmvn-{core,connector}}" %{name}/@1 %{_datadir}/%{name}/lib/@1
+# Tests are skipped as a workaround for rhbz#911365
 %mvn_build -f
 
 %install
 %mvn_install
 
-# /usr/bin/xmvn script
-%jpackage_script org.fedoraproject.maven.Launcher "" "" %{name}/%{name}-launcher:plexus/classworlds %{name} false
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/bin
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/lib/ext
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/bin/m2.conf
+ln -sf %{_datadir}/maven/bin/mvn %{buildroot}%{_datadir}/%{name}/bin/mvn
+ln -sf %{_datadir}/maven/bin/mvnDebug %{buildroot}%{_datadir}/%{name}/bin/mvnDebug
+ln -sf %{_datadir}/maven/bin/mvnyjp %{buildroot}%{_datadir}/%{name}/bin/mvnyjp
+ln -sf %{_datadir}/maven/conf %{buildroot}%{_datadir}/%{name}/conf
+ln -sf %{_datadir}/maven/boot %{buildroot}%{_datadir}/%{name}/boot
+ln -sf %{_datadir}/maven/lib %{buildroot}%{_datadir}/%{name}/lib/maven
 
 # /usr/bin/xmvn-resolve script
 %jpackage_script org.fedoraproject.maven.tools.resolver.ResolverCli "" "" %{name}/%{name}-core:%{name}/%{name}-resolve:beust-jcommander:xml-commons-apis:plexus/containers-container-default:plexus/classworlds:plexus/utils:xbean/xbean-reflect:guava %{name}-resolve true
 
+# /usr/bin/xmvn script
+cat <<EOF >%{buildroot}%{_bindir}/%{name}
+#!/bin/sh -e
+export M2_HOME="\${M2_HOME:-%{_datadir}/%{name}}"
+exec mvn "${@}"
+EOF
+
 
 %files -f .mfiles
 %doc LICENSE NOTICE
@@ -66,6 +82,12 @@ This package provides %{summary}.
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Mar 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.4.0-0.3
+- Update to new upstream snapshot
+- Create custom /usr/bin/xmvn instead of using %%jpackage_script
+- Mirror maven directory structure
+- Add Plexus Classworlds config file
+
 * Wed Mar  6 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.4.0-0.2
 - Update to newer snapshot