From d9c87ef16ed7cc921ea76d2b0d03df522f81d779 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 19 Jul 2013 12:50:20 +0200
Subject: [PATCH] Install license files

- Resolves: rhbz#958116
---
 .gitignore  |  1 +
 aether.spec | 44 +++++++++++++++-----------------------------
 sources     |  4 +---
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 577fd4c..bd08fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /aether-1.13.1.tar.bz2
 /LICENSE-2.0.txt
 /epl-v10.html
+/aether-0.9.0.M2.tar.bz2
diff --git a/aether.spec b/aether.spec
index fa92561..43d4046 100644
--- a/aether.spec
+++ b/aether.spec
@@ -4,19 +4,19 @@
 %bcond_without ahc
 %endif
 
+%global vertag M2
+
 Name:           aether
-Version:        1.13.1
-Release:        11%{?dist}
+Epoch:          1
+Version:        0.9.0
+Release:        0.%{vertag}.0%{?dist}
 Summary:        Sonatype library to resolve, install and deploy artifacts the Maven way
 License:        EPL or ASL 2.0
 URL:            https://docs.sonatype.org/display/AETHER/Home
-# git clone https://github.com/sonatype/sonatype-aether.git
-# git archive --prefix="aether-1.11/" --format=tar aether-1.11 | bzip2 > aether-1.11.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Source2:        http://www.eclipse.org/legal/epl-v10.html
 BuildArch:      noarch
 
+Source0:        http://git.eclipse.org/c/%{name}/%{name}-core.git/snapshot/%{name}-%{version}.%{vertag}.tar.bz2
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
@@ -29,17 +29,6 @@ BuildRequires:  mvn(org.sonatype.sisu:sisu-inject-plexus)
 BuildRequires:  mvn(com.ning:async-http-client)
 %endif
 
-# Require all subpackages for now, until all packages that use aether
-# migrate to appropriate subpackages.  See rhbz #958143
-# TODO: Remove these once the above bug is closed.
-Requires:       %{name}-api                       = %{version}-%{release}
-Requires:       %{name}-connector-file            = %{version}-%{release}
-Requires:       %{name}-connector-wagon           = %{version}-%{release}
-Requires:       %{name}-impl                      = %{version}-%{release}
-Requires:       %{name}-spi                       = %{version}-%{release}
-Requires:       %{name}-test-util                 = %{version}-%{release}
-Requires:       %{name}-util                      = %{version}-%{release}
-
 %description
 Aether is a standalone library to resolve, install and deploy artifacts
 the Maven way.
@@ -120,9 +109,7 @@ artifacts the Maven way.  This package provides Java API documentation
 for Aether.
 
 %prep
-%setup -q
-cp -p %{SOURCE1} LICENSE-ASL
-cp -p %{SOURCE2} LICENSE-EPL
+%setup -q -n %{name}-%{version}.%{vertag}
 
 %if %{without ahc}
 %pom_disable_module aether-connector-asynchttpclient
@@ -145,17 +132,16 @@ for module in asynchttpclient wagon; do (
 # Animal sniffer is not useful in Fedora
 for module in . aether-connector-wagon aether-util aether-api   \
               aether-impl aether-connector-asynchttpclient      \
-              aether-connector-file aether-demo aether-test-util; do
+              aether-connector-file aether-test-util; do
     %pom_remove_plugin :animal-sniffer-maven-plugin $module
 done
 
+%pom_remove_plugin :maven-enforcer-plugin
+
 # Workaround for rhbz#911365
 %pom_xpath_inject pom:project "<dependencies/>"
 %pom_add_dep cglib:cglib:any:test
-
-# Keep compatibility with packages that use old JAR locations until
-# they migrate.
-%mvn_file ":{%{name}-{*}}" %{name}/@1 %{name}/@2
+%pom_add_dep aopalliance:aopalliance:any:test
 
 %build
 %mvn_build -s
@@ -165,11 +151,11 @@ done
 
 %files -f .mfiles-%{name}
 %doc README.md
-%doc LICENSE-ASL LICENSE-EPL
+%doc epl-v10.html notice.html
 
 %files api -f .mfiles-%{name}-api
 %doc README.md
-%doc LICENSE-ASL LICENSE-EPL
+%doc epl-v10.html notice.html
 %dir %{_javadir}/%{name}
 
 %files connector-file -f .mfiles-%{name}-connector-file
@@ -179,7 +165,7 @@ done
 %files test-util -f .mfiles-%{name}-test-util
 %files util -f .mfiles-%{name}-util
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE-ASL LICENSE-EPL
+%doc epl-v10.html notice.html
 
 %if %{with ahc}
 %files connector-asynchttpclient -f .mfiles-%{name}-connector-asynchttpclient
diff --git a/sources b/sources
index f0dd05f..f17102d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-a02f091d4e00e8fe6f35508ba60d95e6  aether-1.13.1.tar.bz2
-3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-d0fc088e4e5216422c217d39853d8601  epl-v10.html
+e454062f186024aeb7b8c16343735d31  aether-0.9.0.M2.tar.bz2