From c6a7f715fa663bf914a9214380e405692df7a8b7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 19 Jul 2013 14:50:11 +0200 Subject: [PATCH] Use sonatype-aether symlinks --- maven.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/maven.spec b/maven.spec index 46d0a3d..f84b5f1 100644 --- a/maven.spec +++ b/maven.spec @@ -2,7 +2,7 @@ Name: maven Version: 3.0.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -22,7 +22,7 @@ BuildArch: noarch BuildRequires: maven-local -BuildRequires: aether-api >= 1.13.1-8 +BuildRequires: aether-api >= 1.13.1-12 BuildRequires: aether-connector-wagon BuildRequires: aether-impl BuildRequires: aether-spi @@ -67,6 +67,9 @@ BuildRequires: xmlunit BuildRequires: animal-sniffer >= 1.6-5 %endif +# Only this version has proper sonatype-aether symlinks +Requires: aether-api >= 1.13.1-12 + # Theoretically Maven might be usable with just JRE, but typical Maven # workflow requires full JDK, wso we require it here. Requires: java-devel @@ -165,11 +168,11 @@ ln -sf $(build-classpath plexus/classworlds) \ (cd %{buildroot}%{_datadir}/%{name}/lib build-jar-repository -s -p . \ - aether/aether-api \ - aether/aether-connector-wagon \ - aether/aether-impl \ - aether/aether-spi \ - aether/aether-util \ + sonatype-aether/aether-api \ + sonatype-aether/aether-connector-wagon \ + sonatype-aether/aether-impl \ + sonatype-aether/aether-spi \ + sonatype-aether/aether-util \ aopalliance \ atinject \ cglib \ @@ -211,6 +214,9 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Fri Jul 19 2013 Mikolaj Izdebski - 3.0.5-8 +- Use sonatype-aether symlinks + * Mon May 20 2013 Mikolaj Izdebski - 3.0.5-7 - Move bash-completion files to primary location - Resolves: rhbz#918000