[maven-antrun-plugin] Adapt to current guidelines
Michal Srb
msrb at fedoraproject.org
Mon Sep 2 11:49:01 UTC 2013
commit 88976606e346c0d1b57e50e8c16ab77902e02308
Author: Michal Srb <msrb at redhat.com>
Date: Mon Sep 2 13:37:43 2013 +0200
Adapt to current guidelines
fix-deps.patch | 14 ---------
maven-antrun-plugin.spec | 74 ++++++++++++++++-----------------------------
2 files changed, 26 insertions(+), 62 deletions(-)
---
diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec
index b3e56c4..91b818c 100644
--- a/maven-antrun-plugin.spec
+++ b/maven-antrun-plugin.spec
@@ -1,81 +1,59 @@
Name: maven-antrun-plugin
Version: 1.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven AntRun Plugin
-Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-antrun-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Patch0: fix-deps.patch
-
-BuildArch: noarch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: plexus-utils
-BuildRequires: ant
-BuildRequires: maven-local
-BuildRequires: maven-install-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-Requires: ant
-Requires: maven
-Requires: jpackage-utils
-Requires: java
+
+BuildArch: noarch
+
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+
Obsoletes: maven2-plugin-antrun <= 0:2.0.8
Provides: maven2-plugin-antrun = 1:%{version}-%{release}
%description
-Runs Ant scripts embedded in the POM
+This plugin provides the ability to run Ant tasks from within Maven.
+It is even possible to embed Ant scripts in the POM.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
-API documentation for %{name}.
+This package contains the API documentation for %{name}.
%prep
%setup -q
-%patch0
-#%patch1
+
+%pom_add_dep org.apache.maven:maven-compat
%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Mon Sep 02 2013 Michal Srb <msrb at redhat.com> - 1.7-6
+- Adapt to current guidelines
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list