[maven-ant-plugin] Migrated to plexus-containers-container-default (Resolves: #878550)

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Dec 11 16:31:40 UTC 2012


commit cdd9b10f88bd278042ace1d759d5bb3e14e3a991
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Dec 11 14:10:54 2012 +0100

    Migrated to plexus-containers-container-default (Resolves: #878550)
    
    - Added license
    - Spec file cleanup
    
    Signed-off-by: Stanislav Ochotnicky <sochotnicky at redhat.com>

 maven-ant-plugin.spec |   20 +++++++++++++-------
 sources               |    1 +
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/maven-ant-plugin.spec b/maven-ant-plugin.spec
index 24726da..cf29afe 100644
--- a/maven-ant-plugin.spec
+++ b/maven-ant-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-ant-plugin
 Version:        2.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Maven Ant Plugin
 
 Group:          Development/Libraries
@@ -9,7 +9,8 @@ URL:            http://maven.apache.org/plugins/maven-ant-plugin
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ant-plugin-2.3/
 #tar jcf maven-ant-plugin-2.3.tar.bz2 maven-ant-plugin-2.3/
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:        %{name}-pom.patch
+Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Patch0:         %{name}-pom.patch
 
 BuildArch: noarch
 
@@ -25,7 +26,7 @@ BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: plexus-utils
 BuildRequires: ant
-BuildRequires: plexus-container-default
+BuildRequires: plexus-containers-container-default
 BuildRequires: maven-plugin-testing-harness
 BuildRequires: junit
 
@@ -34,12 +35,9 @@ Requires:       java
 Requires:       jpackage-utils
 Requires:       plexus-utils
 Requires:       ant
-Requires:       plexus-container-default
+Requires:       plexus-containers-container-default
 Requires:       junit
 
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
-
 Obsoletes: maven2-plugin-ant <= 0:2.0.8
 Provides: maven2-plugin-ant = 0:%{version}-%{release}
 
@@ -58,6 +56,7 @@ API documentation for %{name}.
 %prep
 %setup -q 
 %patch0 -p0
+cp -p %{SOURCE1} .
 
 %build
 mvn-rpmbuild \
@@ -78,14 +77,21 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
+%doc LICENSE-2.0.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
+%doc LICENSE-2.0.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Dec 11 2012 Michal Srb <msrb at redhat.com> - 2.3-10
+- Migrated to plexus-containers-container-default (Resolves: #878550)
+- Added license
+- Spec file cleanup
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f363702..d95728e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 bc2d0d5899d1768b683decfc3f3be6c2  maven-ant-plugin-2.3.tar.bz2
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt


More information about the scm-commits mailing list