[maven-processor-plugin] switch to XMvn
gil
gil at fedoraproject.org
Mon Jul 8 07:20:10 UTC 2013
commit 2e9d3bb75cbf2f13203f03bb5fb00e94cd0a5919
Author: gil <puntogil at libero.it>
Date: Mon Jul 8 09:19:50 2013 +0200
switch to XMvn
maven-processor-plugin.spec | 46 +++++++++---------------------------------
1 files changed, 10 insertions(+), 36 deletions(-)
---
diff --git a/maven-processor-plugin.spec b/maven-processor-plugin.spec
index a668485..53e29c2 100644
--- a/maven-processor-plugin.spec
+++ b/maven-processor-plugin.spec
@@ -1,8 +1,7 @@
Name: maven-processor-plugin
Version: 2.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven Processor Plugin
-Group: Development/Libraries
# some classes and pom file are annotated with ASL 2.0
# and the site here it is hosted says "GNU Lesser GPL"
# contacted the project owner (available in POM) and clarified the license status in LGPLv3
@@ -13,7 +12,6 @@ Url: http://code.google.com/p/maven-annotation-plugin/
Source0: %{name}-%{version}-src-git.tar.xz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
# main deps
BuildRequires: mvn(org.apache.maven:maven-core)
@@ -25,22 +23,9 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: junit
BuildRequires: maven-local
-
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jar-plugin
BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-Requires: maven
-Requires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-Requires: mvn(org.codehaus.plexus:plexus-utils)
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -52,9 +37,7 @@ provided by JDK6 integrated in java compiler
This plugin could be considered the 'alter ego' of maven apt plugin.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -68,32 +51,23 @@ cp -p src/main/resources/COPYING.LESSER .
%build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_file :%{name} %{name}
+%mvn_build -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc COPYING.LESSER
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc COPYING.LESSER
%changelog
+* Mon Jul 08 2013 gil cattaneo <puntogil at libero.it> 2.1.1-3
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Tue Mar 26 2013 gil cattaneo <puntogil at libero.it> 2.1.1-2
- fix B/R list
More information about the scm-commits
mailing list