Attachment 884116 Details for Bug 1085433 – Use mvn_build and update to current guidelines

[patch] Use mvn_build and update to current guidelines

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

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-04-08 15:18:24 UTC

Size: 3.52 KB

patch

obsolete

>From ee5099e81e39827d8b5b4d0d50790a27107c6dd3 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 11 Mar 2014 17:31:14 +0100
>Subject: [PATCH] Use mvn_build
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> jboss-jsf-2.1-api.spec | 68 ++++++++++++++++----------------------------------
> 1 file changed, 21 insertions(+), 47 deletions(-)
>
>diff --git a/jboss-jsf-2.1-api.spec b/jboss-jsf-2.1-api.spec
>index f42bb26..9464122 100644
>--- a/jboss-jsf-2.1-api.spec
>+++ b/jboss-jsf-2.1-api.spec
>@@ -3,9 +3,8 @@
> 
> Name: jboss-jsf-2.1-api
> Version: 2.0.2
>-Release: 8%{dist}
>+Release: 9%{dist}
> Summary: JavaServer Faces 2.1 API
>-Group: Development/Libraries
> License: CDDL or GPLv2 with exceptions
> URL: http://www.jboss.org
> 
>@@ -16,26 +15,14 @@ Source0: %{name}-%{namedversion}.tar.xz
> # Fix the FSF address in the license file:
> Patch0: %{name}-fix-fsf-address.patch
> 
>-BuildRequires: java-devel
>-BuildRequires: jboss-parent
>-BuildRequires: jpackage-utils
>-BuildRequires: geronimo-validation
>-BuildRequires: maven-local
>-BuildRequires: maven-compiler-plugin
>-BuildRequires: maven-install-plugin
>-BuildRequires: maven-jar-plugin
>-BuildRequires: maven-javadoc-plugin
>-BuildRequires: maven-plugin-bundle
>-BuildRequires: objenesis
>-BuildRequires: jboss-el-2.2-api
>-BuildRequires: jboss-jsp-2.2-api
>-BuildRequires: jboss-jstl-1.2-api
>-
>-Requires: jpackage-utils
>-Requires: jboss-jsp-2.2-api
>-Requires: jboss-jstl-1.2-api
>-Requires: jboss-el-2.2-api
>-Requires: geronimo-validation
>+BuildRequires:  maven-local
>+BuildRequires:  jboss-parent
>+BuildRequires:  mvn(javax.validation:validation-api)
>+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
>+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
>+BuildRequires:  mvn(org.jboss.spec.javax.el:jboss-el-api_2.2_spec)
>+BuildRequires:  mvn(org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec)
>+BuildRequires:  mvn(org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec)
> 
> BuildArch:noarch
> 
>@@ -46,11 +33,9 @@ JavaServer(tm) Faces API classes based on Version 2.1 of Specification.
> 
> %package javadoc
> Summary: Javadocs for %{name}
>-Group: Development/Libraries
>-Requires: jpackage-utils
> 
> 
>-%description javadoc	
>+%description javadoc
> This package contains the API documentation for %{name}.
> 
> 
>@@ -63,44 +48,33 @@ This package contains the API documentation for %{name}.
> # Apply the patches:
> %patch0 -p1
> 
>+%pom_xpath_remove "pom:scope[text()='provided']"
> 
>-%build
>-mvn-rpmbuild install javadoc:aggregate
>-
>-
>-%install
>+%mvn_file :jboss-jsf-api_2.1_spec %{name}
> 
>-# Jar files:
>-install -d -m 755 %{buildroot}%{_javadir}
>-install -pm 644 target/jboss-jsf-api_2.1_spec-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}.jar
> 
>-# POM files:
>-install -d -m 755 %{buildroot}%{_mavenpomdir}
>-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%build
>+%mvn_build
> 
>-# Dependencies map:
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "javax.faces:jsf-api"
> 
>-# Javadoc files:
>-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
>-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
>+%install
>+%mvn_install
> 
> 
>-%files
>-%{_javadir}/*
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%files -f .mfiles
> %doc LICENSE
> %doc README
> 
> 
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%files javadoc -f .mfiles-javadoc
> %doc LICENSE
> %doc README
> 
> 
> %changelog
>+* Tue Apr 08 2014 Michael Simacek <msimacek@redhat.com> - 2.0.2-9
>+- Use mvn_build
>+
> * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 2.0.2-8
> - Use Requires: java-headless rebuild (#1067528)
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1085433: 884116