From 8f3de13e44d2237d9ec2a4129d18a0f52b09ac79 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Oct 28 2015 21:31:25 +0000 Subject: Fix symlinks in lib/core --- diff --git a/0001-Copy-core-dependencies-to-lib-core-in-assembly.patch b/0001-Copy-core-dependencies-to-lib-core-in-assembly.patch new file mode 100644 index 0000000..67389a3 --- /dev/null +++ b/0001-Copy-core-dependencies-to-lib-core-in-assembly.patch @@ -0,0 +1,38 @@ +From a2f918fe86c91e1a76d198e824118d5ba474808c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 28 Oct 2015 22:26:44 +0100 +Subject: [PATCH] Copy core dependencies to lib/core in assembly + +--- + xmvn-core/pom.xml | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/xmvn-core/pom.xml b/xmvn-core/pom.xml +index e792f6a..b0ef6b5 100644 +--- a/xmvn-core/pom.xml ++++ b/xmvn-core/pom.xml +@@ -128,6 +128,21 @@ + + + ++ ++ maven-dependency-plugin ++ ++ ++ copy-dependencies ++ package ++ ++ copy-dependencies ++ ++ ++ runtime ++ ++ ++ ++ + + + +-- +2.4.3 + diff --git a/xmvn.spec b/xmvn.spec index 5c92d71..107001d 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -8,7 +8,7 @@ Name: xmvn Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -16,6 +16,8 @@ BuildArch: noarch Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz +Patch0: 0001-Copy-core-dependencies-to-lib-core-in-assembly.patch + BuildRequires: maven >= 3.3 BuildRequires: maven-local BuildRequires: beust-jcommander @@ -154,6 +156,7 @@ This package provides %{summary}. %prep %setup -q +%patch0 -p1 %mvn_package ":xmvn{,-it}" __noinstall @@ -294,6 +297,9 @@ cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/ %doc LICENSE NOTICE %changelog +* Wed Oct 28 2015 Mikolaj Izdebski - 2.5.0-2 +- Fix symlinks in lib/core + * Wed Oct 28 2015 Mikolaj Izdebski - 2.5.0-1 - Update to upstream version 2.5.0