[xmvn] Don't try to relativize symlink targets

[Mikolaj Izdebski]

commit 38ca401b57c2dc73ce92ba35cffd5a03e83c1a88
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Sep 23 17:09:40 2013 +0200

    Don't try to relativize symlink targets

 0001-Don-t-try-to-relativize-symlink-targets.patch |   26 ++++++++++++++++++++
 xmvn.spec                                          |   13 +++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/0001-Don-t-try-to-relativize-symlink-targets.patch b/0001-Don-t-try-to-relativize-symlink-targets.patch
new file mode 100644
index 0000000..ea28069
--- /dev/null
+++ b/0001-Don-t-try-to-relativize-symlink-targets.patch
@@ -0,0 +1,26 @@
+From 51259942aacc2a3b02564ae43dfabebb98aebf58 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Mon, 23 Sep 2013 14:38:34 +0200
+Subject: [PATCH] Don't try to relativize symlink targets
+
+---
+ .../src/main/java/org/fedoraproject/maven/installer/impl/Package.java  | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java b/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java
+index 95faa06..1ab04b6 100644
+--- a/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java
++++ b/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java
+@@ -89,8 +89,7 @@ class Package
+     public void addSymlink( Path symlink, Path target )
+         throws IOException
+     {
+-        Path symlinkTarget = symlink.getParent().relativize( target );
+-        Path symlinkFile = FileUtils.createAnonymousSymlink( symlinkTarget );
++        Path symlinkFile = FileUtils.createAnonymousSymlink( target );
+         addFile( symlinkFile, symlink, 0644 );
+     }
+ 
+-- 
+1.8.1.4
+
diff --git a/xmvn.spec b/xmvn.spec
index c89f1fc..6659d7e 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -1,11 +1,12 @@
 Name:           xmvn
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?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
+Patch0:         0001-Don-t-try-to-relativize-symlink-targets.patch
 
 BuildRequires:  maven >= 3.1.0
 BuildRequires:  maven-local
@@ -32,6 +33,7 @@ This package provides %{summary}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Add cglib test dependency as a workaround for rhbz#911365
 #pom_add_dep cglib:cglib::test %{name}-core
@@ -53,7 +55,6 @@ ln -s %{_datadir}/maven target/dependency/apache-maven-$mver
 rm -rf src/it
 
 %build
-%mvn_file ":{xmvn-{core,connector}}" %{name}/@1 ../%{name}/lib/@1
 %mvn_build -X
 
 tar --delay-directory-restore -xvf target/*tar.bz2
@@ -63,6 +64,7 @@ chmod -R +rwX %{name}-%{version}*
 %install
 %mvn_install
 
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
 cp -r %{name}-%{version}*/* %{buildroot}%{_datadir}/%{name}/
 ln -sf %{_datadir}/maven/bin/mvn %{buildroot}%{_datadir}/%{name}/bin/mvn
 ln -sf %{_datadir}/maven/bin/mvnDebug %{buildroot}%{_datadir}/%{name}/bin/mvnDebug
@@ -90,11 +92,11 @@ done
 # copy over maven lib directory
 cp -r %{_datadir}/maven/lib/* %{buildroot}%{_datadir}/%{name}/lib/
 
+# possibly recreate symlinks that can be automated with xmvn-subst
+%{name}-subst %{buildroot}%{_datadir}/%{name}/
 for jar in core connector;do
     ln -sf %{_javadir}/%{name}/%{name}-$jar.jar %{buildroot}%{_datadir}/%{name}/lib
 done
-# possibly recreate symlinks that can be automated with xmvn-subst
-%{name}-subst %{buildroot}%{_datadir}/%{name}/
 
 for tool in subst resolver bisect installer;do
     # sisu doesn't contain pom.properties. Manually replace with symlinks
@@ -141,6 +143,9 @@ end
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0.2-2
+- Don't try to relativize symlink targets
+
 * Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0.2-1
 - Update to upstream version 1.0.2