Adapt to current guidelines

This commit is contained in:
Michal Srb 2013-09-02 13:37:43 +02:00
parent 9091aa952f
commit 08b7ea01ee
2 changed files with 24 additions and 60 deletions

View File

@ -1,14 +0,0 @@
--- pom.xml.orig 2011-10-28 20:00:32.000000000 +0300
+++ pom.xml 2011-11-01 09:52:35.921717462 +0200
@@ -71,6 +71,11 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>

View File

@ -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
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)
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
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@redhat.com> - 1.7-6
- Adapt to current guidelines
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild