Attachment 886402 Details for Bug 1087767 – Use mvn_build

[patch] Use mvn_build

0001-Use-mvn_build.patch (text/plain), 3.89 KB, created by Michael Simacek on 2014-04-15 09:00:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-04-15 09:00:55 UTC

Size: 3.89 KB

patch

obsolete

>From 2a1a7ad9ef974a474a52a15fc3272183f370ac2b Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 15 Apr 2014 10:57:50 +0200
>Subject: [PATCH] Use mvn_build
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> maven-stage-plugin.spec | 66 ++++++++++++++++++-------------------------------
> 1 file changed, 24 insertions(+), 42 deletions(-)
>
>diff --git a/maven-stage-plugin.spec b/maven-stage-plugin.spec
>index b308e2a..a9143b3 100644
>--- a/maven-stage-plugin.spec
>+++ b/maven-stage-plugin.spec
>@@ -1,10 +1,9 @@
> %global project_version 1.0-alpha-2
> Name:           maven-stage-plugin
> Version:        1.0
>-Release:        0.10.alpha2%{?dist}
>+Release:        0.11.alpha2%{?dist}
> Summary:        Plugin to copy artifacts from one repository to another
> 
>-Group:          Development/Libraries
> License:        ASL 2.0
> URL:            http://maven.apache.org/plugins/maven-stage-plugin/
> # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-2/
>@@ -16,24 +15,20 @@ Patch0:         %{name}-plexus-maven-plugin.patch
> 
> BuildArch: noarch
> 
>-BuildRequires: plexus-containers-component-metadata
>-BuildRequires: ant
>-BuildRequires: java-devel >= 1:1.6.0
>-BuildRequires: jpackage-utils
>-BuildRequires: maven-local
>-BuildRequires: maven-compiler-plugin
>-BuildRequires: maven-install-plugin
>-BuildRequires: maven-jar-plugin
>-BuildRequires: maven-javadoc-plugin
>-BuildRequires: maven-plugin-plugin
>-BuildRequires: maven-plugin-testing-harness
>-BuildRequires: maven-resources-plugin
>-BuildRequires: maven-surefire-plugin
>-BuildRequires: maven-surefire-provider-junit
>-BuildRequires: plexus-utils
>-Requires: ant
>-Requires: maven
>-Requires: jpackage-utils
>+BuildRequires:  maven-local
>+BuildRequires:  mvn(junit:junit)
>+BuildRequires:  mvn(org.apache.maven:maven-artifact)
>+BuildRequires:  mvn(org.apache.maven:maven-artifact-manager)
>+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
>+BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)
>+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
>+BuildRequires:  mvn(org.apache.maven.wagon:wagon-file)
>+BuildRequires:  mvn(org.apache.maven.wagon:wagon-http-lightweight)
>+BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
>+BuildRequires:  mvn(org.apache.maven.wagon:wagon-ssh)
>+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
>+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
>+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
> 
> Obsoletes: maven2-plugin-stage <= 0:2.0.8
> Provides: maven2-plugin-stage = 1:%{version}-%{release}
>@@ -44,9 +39,7 @@ Its main use is for copying artifacts from a staging repository to
> the real repository.
> 
> %package javadoc
>-Group:          Documentation
> Summary:        Javadoc for %{name}
>-Requires: jpackage-utils
> 
> %description javadoc
> API documentation for %{name}.
>@@ -56,33 +49,22 @@ API documentation for %{name}.
> %setup -q -n %{name}-%{project_version}
> %patch0 -p1
> 
>+%mvn_file :%{name} %{name}
>+
> %build
>-mvn-rpmbuild install javadoc:aggregate
>+%mvn_build
> 
> %install
>-# jars
>-install -d -m 0755 %{buildroot}%{_javadir}
>-install -m 644 target/%{name}-%{project_version}.jar   %{buildroot}%{_javadir}/%{name}.jar
>-
>-# 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
>+%mvn_install
> 
>-# javadoc
>-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
>-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
>+%files -f .mfiles
> 
>-%files
>-%{_javadir}/*
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>-
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%files javadoc -f .mfiles-javadoc
> 
> %changelog
>+* Tue Apr 15 2014 Michael Simacek <msimacek@redhat.com> - 1.0-0.11.alpha2
>+- Use mvn_build
>+
> * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 1.0-0.10.alpha2
> - Use Requires: java-headless rebuild (#1067528)
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1087767: 886402 | 893984 | 893985