Attachment 886395 Details for Bug 992603 – Use mvn_build

[patch] Use mvn_build

0001-Use-mvn_build.patch (text/plain), 2.93 KB, created by Michael Simacek on 2014-04-15 08:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-04-15 08:10:11 UTC

Size: 2.93 KB

patch

obsolete

>From c26566aa27b9f4e0c0d3bd9c3852a2f187fe8840 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 8 Apr 2014 16:59:38 +0200
>Subject: [PATCH] Use mvn_build
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> jboss-naming.spec | 47 +++++++++++------------------------------------
> 1 file changed, 11 insertions(+), 36 deletions(-)
>
>diff --git a/jboss-naming.spec b/jboss-naming.spec
>index dd9a98c..6c36399 100644
>--- a/jboss-naming.spec
>+++ b/jboss-naming.spec
>@@ -3,9 +3,8 @@
> 
> Name:             jboss-naming
> Version:          5.0.6
>-Release:          0.8%{namedreltag}%{?dist}
>+Release:          0.9%{namedreltag}%{?dist}
> Summary:          JBoss Naming
>-Group:            Development/Libraries
> License:          LGPLv2+
> URL:              http://www.jboss.org
> 
>@@ -27,17 +26,11 @@ BuildRequires:    maven-antrun-plugin
> BuildRequires:    maven-enforcer-plugin
> BuildRequires:    rmic-maven-plugin
> 
>-Requires:         jboss-common-core
>-Requires:         jboss-logging
>-Requires:         jpackage-utils
>-
> %description
> The JBoss JNDI name server implementation
> 
> %package javadoc
> Summary:          Javadocs for %{name}
>-Group:            Documentation
>-Requires:         jpackage-utils
> 
> %description javadoc
> This package contains the API documentation for %{name}.
>@@ -46,43 +39,25 @@ This package contains the API documentation for %{name}.
> %setup -q -n %{name}-%{namedversion}
> %patch0 -p1
> 
>+%mvn_file ':jnp-{client,server}' %{name}-@1
>+
> %build
> # No jboss-test and jboss-kernel packages
>-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
>+%mvn_build -f
> 
> %install
>-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-
>-# JAR
>-install -pm 644 jnpclient/target/jnp-client-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-client.jar
>-install -pm 644 jnpserver/target/jnpserver-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-server.jar
>-
>-# POM
>-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-build.pom
>-install -pm 644 jnpclient/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client.pom
>-install -pm 644 jnpserver/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom
>-
>-# DEPMAP
>-%add_maven_depmap JPP-%{name}-build.pom
>-%add_maven_depmap JPP-%{name}-client.pom %{name}-client.jar
>-%add_maven_depmap JPP-%{name}-server.pom %{name}-server.jar
>-
>-# APIDOCS
>-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-
>-%files
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>-%{_javadir}/*
>+%mvn_install
>+
>+%files -f .mfiles
> %doc JBossORG-EULA.txt
> 
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%files javadoc -f .mfiles-javadoc
> %doc JBossORG-EULA.txt
> 
> %changelog
>+* Tue Apr 08 2014 Michael Simacek <msimacek@redhat.com> - 5.0.6-0.9.CR1
>+- Use mvn_build
>+
> * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 5.0.6-0.8.CR1
> - Use Requires: java-headless rebuild (#1067528)
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 992603: 886395