[maven-plugin-tools] Adapt to current guidelines (Resolves: #960526)
Michal Srb
msrb at fedoraproject.org
Fri Aug 30 05:40:26 UTC 2013
commit 4d666a134a8b6c73eeed0415e2a76123c054ade1
Author: Michal Srb <msrb at redhat.com>
Date: Fri Aug 30 07:24:31 2013 +0200
Adapt to current guidelines (Resolves: #960526)
maven-plugin-tools.spec | 331 ++++++++++-------------------------------------
1 files changed, 69 insertions(+), 262 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 3af6913..352a099 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,10 +1,9 @@
Name: maven-plugin-tools
Version: 3.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
-Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugin-tools/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
@@ -14,53 +13,37 @@ BuildArch: noarch
# See: rhbz#920042, http://jira.codehaus.org/browse/MPLUGIN-242
Patch0: %{name}-rhbz-920042.patch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
BuildRequires: maven-local
-BuildRequires: ant
-BuildRequires: bsh
-BuildRequires: jtidy
-BuildRequires: maven-artifact-manager
-BuildRequires: maven-doxia-sink-api
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-plugin-annotations
-BuildRequires: maven-plugin-descriptor
-BuildRequires: maven-plugin-registry
-BuildRequires: maven-plugin-tools-annotations
-BuildRequires: maven-plugin-tools-api
-BuildRequires: maven-plugin-tools-generators
-BuildRequires: maven-plugin-tools-java
-BuildRequires: maven-plugin-tools-model
-BuildRequires: maven-project
-BuildRequires: maven-shared-reporting-api
-BuildRequires: maven-shared-reporting-impl
-BuildRequires: objectweb-asm
-BuildRequires: plexus-ant-factory
-BuildRequires: plexus-archiver
-BuildRequires: plexus-bsh-factory
-BuildRequires: plexus-containers-component-annotations
-BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-utils
-BuildRequires: plexus-velocity
-BuildRequires: qdox
-BuildRequires: velocity
-# This is parent POM of the plexus-ant-factory. It is not pulled in
-# as a dependency of plexus-ant-factory, but we need it, because
-# maven-script-ant subpackage fails to build without it.
-BuildRequires: plexus-component-factories-pom
-# Test dependencies:
-%if 0
-BuildRequires: easymock
-BuildRequires: fest-assert
-BuildRequires: junit
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: plexus-compiler
-BuildRequires: xmlunit
-%endif
-
-Requires: java
-Requires: jpackage-utils
+BuildRequires: mvn(asm:asm)
+BuildRequires: mvn(asm:asm-commons)
+BuildRequires: mvn(bsh:bsh)
+BuildRequires: mvn(com.thoughtworks.qdox:qdox)
+BuildRequires: mvn(net.sf.jtidy:jtidy)
+BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.ant:ant-launcher)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-parent)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-plugin-descriptor)
+BuildRequires: mvn(org.apache.maven:maven-plugin-registry)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven:maven-repository-metadata)
+BuildRequires: mvn(org.apache.velocity:velocity)
+BuildRequires: mvn(org.codehaus.plexus:plexus-ant-factory)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-bsh-factory)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
%description
@@ -70,9 +53,6 @@ Plugins in a variety of languages.
%package -n maven-plugin-annotations
Summary: Maven Plugin Java 5 Annotations
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
Obsoletes: maven-plugin-annotations < 0:%{version}-%{release}
%description -n maven-plugin-annotations
@@ -81,26 +61,6 @@ This package contains Java 5 annotations to use in Mojos.
%package -n maven-plugin-plugin
Summary: Maven Plugin Plugin
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-artifact-manager
-Requires: maven-doxia-sink-api
-Requires: maven-doxia-sitetools
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-registry
-Requires: maven-plugin-tools-annotations
-Requires: maven-plugin-tools-api
-Requires: maven-plugin-tools-beanshell
-Requires: maven-plugin-tools-generators
-Requires: maven-plugin-tools-java
-Requires: maven-plugin-tools-model
-Requires: maven-project
-Requires: maven-shared-reporting-api
-Requires: maven-shared-reporting-impl
-Requires: plexus-utils
-Requires: plexus-velocity
-Requires: velocity
Obsoletes: maven2-plugin-plugin < 0:%{version}-%{release}
Provides: maven2-plugin-plugin = 0:%{version}-%{release}
@@ -113,19 +73,6 @@ artifact metadata and a generic help goal.
%package annotations
Summary: Maven Plugin Tool for Annotations
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-plugin-annotations
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-project
-Requires: objectweb-asm
-Requires: plexus-archiver
-Requires: plexus-containers-component-annotations
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: qdox
%description annotations
This package provides Java 5 annotation tools for use with Apache Maven.
@@ -133,15 +80,6 @@ This package provides Java 5 annotation tools for use with Apache Maven.
%package ant
Summary: Maven Plugin Tool for Ant
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-plugin-tools-model
-Requires: maven-project
-Requires: plexus-containers-component-annotations
-Requires: plexus-containers-container-default
-Requires: plexus-utils
Obsoletes: maven-shared-plugin-tools-ant < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-ant = 0:%{version}-%{release}
@@ -151,13 +89,6 @@ Descriptor extractor for plugins written in Ant.
%package api
Summary: Maven Plugin Tools APIs
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-project
-Requires: plexus-containers-container-default
-Requires: plexus-utils
Obsoletes: maven-shared-plugin-tools-api < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release}
@@ -168,12 +99,6 @@ and generate documentation for Maven Plugins.
%package beanshell
Summary: Maven Plugin Tool for Beanshell
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: bsh
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: plexus-containers-component-annotations
Obsoletes: maven-shared-plugin-tools-beanshell < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-beanshell = 0:%{version}-%{release}
@@ -183,19 +108,6 @@ Descriptor extractor for plugins written in Beanshell.
%package generators
Summary: Maven Plugin Tools Generators
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: jtidy
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-project
-Requires: maven-shared-reporting-api
-Requires: objectweb-asm
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: plexus-velocity
-Requires: velocity
%description generators
The Maven Plugin Tools Generators provides content generation
@@ -204,16 +116,6 @@ The Maven Plugin Tools Generators provides content generation
%package java
Summary: Maven Plugin Tool for Java
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-plugin-tools-api
-Requires: maven-project
-Requires: plexus-containers-component-annotations
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: qdox
Obsoletes: maven-shared-plugin-tools-java < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-java = 0:%{version}-%{release}
@@ -225,9 +127,6 @@ Descriptor extractor for plugins written in Java.
%package javadoc
Summary: Maven Plugin Tools Javadoc
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven-plugin-tools-java
%description javadoc
The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when
@@ -239,11 +138,6 @@ Java API documentation for %{name} is contained in
%package model
Summary: Maven Plugin Metadata Model
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven-plugin-descriptor
-Requires: plexus-containers-container-default
-Requires: plexus-utils
Obsoletes: maven-shared-plugin-tools-model < 0:%{version}-%{release}
Provides: maven-shared-plugin-tools-model = 0:%{version}-%{release}
@@ -254,7 +148,6 @@ model.
%package -n maven-script
Summary: Maven Script Mojo Support
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: jpackage-utils
%description -n maven-script
Maven Script Mojo Support lets developer write Maven plugins/goals
@@ -263,16 +156,6 @@ with scripting languages instead of compiled Java.
%package -n maven-script-ant
Summary: Maven Ant Mojo Support
Requires: maven-script = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: ant
-Requires: maven
-Requires: maven-plugin-descriptor
-Requires: maven-project
-Requires: plexus-ant-factory
-Requires: plexus-archiver
-Requires: plexus-containers-container-default
-Requires: plexus-component-factories-pom
%description -n maven-script-ant
This package provides %{summary}, which write Maven plugins with
@@ -281,10 +164,6 @@ Ant scripts.
%package -n maven-script-beanshell
Summary: Maven Beanshell Mojo Support
Requires: maven-script = %{epoch}:%{version}-%{release}
-Requires: java
-Requires: jpackage-utils
-Requires: maven
-Requires: plexus-bsh-factory
%description -n maven-script-beanshell
This package provides %{summary}, which write Maven plugins with
@@ -295,9 +174,7 @@ Beanshell scripts.
# consensus that current naming scheme should be kept, even if it doesn't
# conform to the guidelines. mizdebsk, September 2012
%package javadocs
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadocs
API documentation for %{name}.
@@ -318,120 +195,50 @@ ln -s maven-script/maven-script-{ant,beanshell} .
%mvn_config buildSettings/skipTests true
%build
-mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true
+%mvn_build -s -f
%install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-# pom artifacts
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-install -pm 644 maven-script/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-script.pom
-%add_maven_depmap -f maven-script JPP.%{name}-maven-script.pom
-mv %{buildroot}%{_mavendepmapfragdir}/%{name}-maven-script %{buildroot}%{_mavendepmapfragdir}/maven-script
-
-# jar or plugin artifacts
-for module in \
- maven-plugin-annotations \
- maven-plugin-plugin \
- maven-plugin-tools-annotations \
- maven-plugin-tools-ant \
- maven-plugin-tools-api \
- maven-plugin-tools-beanshell \
- maven-plugin-tools-generators \
- maven-plugin-tools-java \
- maven-plugin-tools-javadoc \
- maven-plugin-tools-model \
- maven-script-ant \
- maven-script-beanshell
-do
- install -p -m 644 ${module}/target/${module}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${module}.jar
- install -p -m 644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${module}.pom
- %add_maven_depmap -f ${module} JPP.%{name}-${module}.pom %{name}/${module}.jar
- mv %{buildroot}%{_mavendepmapfragdir}/%{name}-${module} %{buildroot}%{_mavendepmapfragdir}/${module}
-done
-
-# javadoc
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
-%doc LICENSE NOTICE
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files -n maven-plugin-annotations
-%{_javadir}/%{name}/maven-plugin-annotations.jar
-%{_mavenpomdir}/JPP.%{name}-maven-plugin-annotations.pom
-%{_mavendepmapfragdir}/maven-plugin-annotations
-
-%files -n maven-plugin-plugin
-%{_javadir}/%{name}/maven-plugin-plugin.jar
-%{_mavenpomdir}/JPP.%{name}-maven-plugin-plugin.pom
-%{_mavendepmapfragdir}/maven-plugin-plugin
-
-%files annotations
-%{_javadir}/%{name}/%{name}-annotations.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-annotations.pom
-%{_mavendepmapfragdir}/%{name}-annotations
-
-%files ant
-%{_javadir}/%{name}/%{name}-ant.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-ant.pom
-%{_mavendepmapfragdir}/%{name}-ant
-
-%files api
-%{_javadir}/%{name}/%{name}-api.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
-%{_mavendepmapfragdir}/%{name}-api
-
-%files beanshell
-%{_javadir}/%{name}/%{name}-beanshell.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-beanshell.pom
-%{_mavendepmapfragdir}/%{name}-beanshell
-
-%files generators
-%{_javadir}/%{name}/%{name}-generators.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-generators.pom
-%{_mavendepmapfragdir}/%{name}-generators
-
-%files java
-%{_javadir}/%{name}/%{name}-java.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-java.pom
-%{_mavendepmapfragdir}/%{name}-java
-
-%files javadoc
-%{_javadir}/%{name}/%{name}-javadoc.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-javadoc.pom
-%{_mavendepmapfragdir}/%{name}-javadoc
-
-%files model
-%{_javadir}/%{name}/%{name}-model.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-model.pom
-%{_mavendepmapfragdir}/%{name}-model
-
-%files -n maven-script
-%{_mavenpomdir}/JPP.%{name}-maven-script.pom
-%{_mavendepmapfragdir}/maven-script
-
-%files -n maven-script-ant
-%{_javadir}/%{name}/maven-script-ant.jar
-%{_mavenpomdir}/JPP.%{name}-maven-script-ant.pom
-%{_mavendepmapfragdir}/maven-script-ant
-
-%files -n maven-script-beanshell
-%{_javadir}/%{name}/maven-script-beanshell.jar
-%{_mavenpomdir}/JPP.%{name}-maven-script-beanshell.pom
-%{_mavendepmapfragdir}/maven-script-beanshell
-
-%files javadocs
+%mvn_install
+
+
+%files -f .mfiles-maven-plugin-tools
+%dir %{_javadir}/%{name}
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
+
+%files -n maven-plugin-annotations -f .mfiles-maven-plugin-annotations
+
+%files -n maven-plugin-plugin -f .mfiles-maven-plugin-plugin
+
+%files annotations -f .mfiles-maven-plugin-tools-annotations
+
+%files ant -f .mfiles-maven-plugin-tools-ant
+
+%files api -f .mfiles-maven-plugin-tools-api
+
+%files beanshell -f .mfiles-maven-plugin-tools-beanshell
+
+%files generators -f .mfiles-maven-plugin-tools-generators
+
+%files java -f .mfiles-maven-plugin-tools-java
+
+%files javadoc -f .mfiles-maven-plugin-tools-javadoc
+
+%files model -f .mfiles-maven-plugin-tools-model
+
+%files -n maven-script -f .mfiles-maven-script
+
+%files -n maven-script-ant -f .mfiles-maven-script-ant
+
+%files -n maven-script-beanshell -f .mfiles-maven-script-beanshell
+
+%files javadocs -f .mfiles-javadoc
+ %doc LICENSE NOTICE
%changelog
+* Thu Aug 29 2013 Michal Srb <msrb at redhat.com> - 0:3.1-14
+- Adapt to current guidelines (Resolves: #960526)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list