commit cfc4f2036e4244222c9740dea43f82d37796932d
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jan 16 16:16:29 2013 +0100
Build with xmvn
maven-source-plugin.spec | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
---
diff --git a/maven-source-plugin.spec b/maven-source-plugin.spec
index 5e80fab..384472d 100644
--- a/maven-source-plugin.spec
+++ b/maven-source-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-source-plugin
Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plugin creating source jar
Group: Development/Libraries
@@ -10,11 +10,10 @@ Source0:
http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%
BuildArch: noarch
+BuildRequires: xmvn >= 0.2.3
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
BuildRequires: ant
-BuildRequires: maven
-BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
@@ -22,12 +21,7 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: jpackage-utils
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4)
-Requires: ant
-Requires: maven
-Requires: jpackage-utils
-Requires: java
Obsoletes: maven2-plugin-source < 0:%{version}-%{release}
Provides: maven2-plugin-source = 0:%{version}-%{release}
@@ -39,7 +33,6 @@ source files of the current project.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -50,37 +43,23 @@ API documentation for %{name}.
sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
%build
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
- install javadoc:aggregate
+%mvn_file : %{name}
+%mvn_build -f
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
-%add_to_maven_depmap org.apache.maven.plugins maven-source-plugin %{version} JPP
maven-source-plugin
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Wed Jan 16 2013 Michal Srb <msrb(a)redhat.com> - 2.2.1-3
+- Build with xmvn
+
* Fri Nov 23 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.1-2
- Install license files
- Resolves: rhbz#876837