Attachment 886496 Details for Bug 992794 – Use mvn_build

[patch] Use mvn_build

0001-Use-mvn_build.patch (text/plain), 3.50 KB, created by Michael Simacek on 2014-04-15 14:31:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-04-15 14:31:34 UTC

Size: 3.50 KB

patch

obsolete

>From 3452c182da93f9e1546c402132673b45054ca1f8 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 15 Apr 2014 16:28:31 +0200
>Subject: [PATCH] Use mvn_build
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> picketbox-xacml.spec | 65 +++++++++++++++-------------------------------------
> 1 file changed, 18 insertions(+), 47 deletions(-)
>
>diff --git a/picketbox-xacml.spec b/picketbox-xacml.spec
>index 2bb0a18..9bba453 100644
>--- a/picketbox-xacml.spec
>+++ b/picketbox-xacml.spec
>@@ -3,9 +3,8 @@
> 
> Name:             picketbox-xacml
> Version:          2.0.7
>-Release:          7%{?dist}
>+Release:          8%{?dist}
> Summary:          JBoss XACML
>-Group:            Development/Libraries
> License:          LGPLv2+
> URL:              http://www.jboss.org/picketbox
> 
>@@ -16,27 +15,15 @@ Patch0:           %{name}-%{namedversion}-pom.patch
> 
> BuildArch:        noarch
> 
>-BuildRequires:    jpackage-utils
>-BuildRequires:    java-devel
>-BuildRequires:    maven-local
>-BuildRequires:    maven-compiler-plugin
>-BuildRequires:    maven-enforcer-plugin
>-BuildRequires:    maven-install-plugin
>-BuildRequires:    maven-jar-plugin
>-BuildRequires:    maven-javadoc-plugin
>-BuildRequires:    junit4
>-BuildRequires:    picketbox-commons
>-
>-Requires:         picketbox-commons
>-Requires:         jpackage-utils
>+BuildRequires:  maven-local
>+BuildRequires:  mvn(junit:junit)
>+BuildRequires:  mvn(org.picketbox:picketbox-commons)
> 
> %description
> JBoss XACML Library
> 
> %package javadoc
> Summary:          Javadocs for %{name}
>-Group:            Documentation
>-Requires:         jpackage-utils
> 
> %description javadoc
> This package contains the API documentation for %{name}.
>@@ -47,42 +34,26 @@ This package contains the API documentation for %{name}.
> 
> rm .classpath
> 
>+%mvn_file :jboss-xacml %{name}
>+%mvn_file :jboss-sunxacml picketbox-sunxacml
>+%mvn_alias :jboss-xacml org.jboss.security:jbossxacml
>+%mvn_package ::pom: __noinstall
>+
> %build
> # Disabled tests because OpenDS is needed
>-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
>+%mvn_build -f
> 
> %install
>-# JAR
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>-install -pm 644 jboss-xacml/target/jboss-xacml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>-install -pm 644 jboss-sunxacml/target/jboss-sunxacml-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/picketbox-sunxacml.jar
>-
>-# POM
>-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-install -pm 644 parent/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
>-install -pm 644 jboss-xacml/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>-install -pm 644 jboss-sunxacml/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-picketbox-sunxacml.pom
>-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-main.pom
>-
>-# DEPMAP
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.jboss.security:jbossxacml"
>-%add_maven_depmap JPP-picketbox-sunxacml.pom picketbox-sunxacml.jar
>-%add_maven_depmap JPP-%{name}-parent.pom
>-%add_maven_depmap JPP-%{name}-main.pom
>-
>-# APIDOCS
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-
>-%files
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>-%{_javadir}/*
>-
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%mvn_install
>+
>+%files -f .mfiles
>+
>+%files javadoc -f .mfiles-javadoc
> 
> %changelog
>+* Tue Apr 15 2014 Michael Simacek <msimacek@redhat.com> - 2.0.7-8
>+- Use mvn_build
>+
> * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 2.0.7-7
> - Use Requires: java-headless rebuild (#1067528)
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 992794: 886496