Attachment 878508 Details for Bug 1080512 – Use mvn_install for installation

[patch] Use mvn_install for installation

0001-Use-mvn_install-for-installation.patch (text/plain), 3.80 KB, created by Michael Simacek on 2014-03-25 15:12:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-03-25 15:12:32 UTC

Size: 3.80 KB

patch

obsolete

>From d57eefd4875f4e4e712af955fdf75495a8320c72 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 25 Mar 2014 16:05:11 +0100
>Subject: [PATCH] Use mvn_install for installation
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> axiom.spec | 57 ++++++++++++++-------------------------------------------
> 1 file changed, 14 insertions(+), 43 deletions(-)
>
>diff --git a/axiom.spec b/axiom.spec
>index 0d3e601..cbc6c5e 100644
>--- a/axiom.spec
>+++ b/axiom.spec
>@@ -1,11 +1,10 @@
> Name:           axiom
> Version:        1.2.12
>-Release:        7%{?dist}
>+Release:        8%{?dist}
> Epoch:          0
> Summary:        Axis Object Model
> License:        ASL 2.0
> Url:            http://ws.apache.org/commons/axiom/
>-Group:          Development/Libraries
> # svn export http://svn.apache.org/repos/asf/webservices/commons/tags/axiom/1.2.12/ axiom-1.2.12
> # tar caf axiom-1.2.12.tar.xz axiom-1.2.12
> Source0:        %{name}-%{version}.tar.xz
>@@ -15,7 +14,6 @@ Source0:        %{name}-%{version}.tar.xz
> # 3) Remove maven plugins not present in Fedora, which do not impact the build process
> # 4) Remove modules which require additional dependencies not yet in Fedora
> Patch0:         axiom-build-fixes.patch
>-BuildRequires:  ant
> BuildRequires:  junit
> BuildRequires:  maven-local
> BuildRequires:  maven-install-plugin
>@@ -27,16 +25,8 @@ BuildRequires:  apache-commons-logging
> BuildRequires:  jaxen
> BuildRequires:  jdepend
> BuildRequires:  woodstox-core
>-BuildRequires:  xerces-j2
>-BuildRequires:  xml-commons-jaxp-1.3-apis
> BuildRequires:  xmlunit
>-Requires:       bea-stax-api
>-Requires:       xml-commons-jaxp-1.3-apis
>-Requires:       javamail >= 0:1.4
>-Requires:       apache-commons-logging
>-Requires:       jaxen
>-Requires:       woodstox-core
>-Requires:       xerces-j2
>+
> BuildArch:      noarch
> 
> %description
>@@ -46,8 +36,6 @@ Apache Axis2.
> 
> %package javadoc
> Summary:        API Documentation for %{name}
>-Group:          Documentation
>-Requires:       jpackage-utils
> 
> %description javadoc
> %{summary}.
>@@ -62,46 +50,29 @@ rm -rf modules/axiom-jaxen-testsuite/src/main/
> 
> %pom_remove_dep :axiom-testutils modules/axiom-api
> 
>+%pom_remove_plugin :build-helper-maven-plugin
>+
> %build
> # Skipping tests for now due to many extra deps
> %mvn_build -f
> 
> %install
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/axiom
>-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-
>-install -m 644 target/%{name}*.jar \
>-           $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
>-install -pm 644 pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
>-%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
>-install -pm 644 modules/%{name}-parent/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom
>-%add_maven_depmap JPP.%{name}-parent.pom
>-
>-for mod in axiom-api axiom-dom axiom-impl axiom-c14n; do
>-    install -m 644 modules/${mod}/target/${mod}-%{version}.jar \
>-        $RPM_BUILD_ROOT%{_javadir}/%{name}/${mod}.jar
>-    install -pm 644 modules/${mod}/pom.xml \
>-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${mod}.pom
>-    %add_maven_depmap JPP.%{name}-${mod}.pom %{name}/${mod}.jar
>-done
>-
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
>-cp -rp target/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-
>-%files
>+%mvn_install
>+
>+%files -f .mfiles
>+%dir %{_javadir}/%{name}
> %doc *.txt
> %doc NOTICE
>-%{_javadir}/axiom/*.jar
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
> 
>-%files javadoc
>+%files javadoc -f .mfiles-javadoc
> %doc NOTICE
>-%{_javadocdir}/%{name}
> 
> %changelog
>+* Tue Mar 25 2014 Michael Simacek <msimacek@redhat.com> - 0:1.2.12-8
>+- Use mvn_install for installation
>+- Remove all-in-one JAR (bundling)
>+- Cleanup BuildRequires
>+
> * Sun Oct 20 2013 Matt Spaulding <mspaulding06@gmail.com> - 0:1.2.12-7
> - Fix FTBFS (#992007)
> - Fixed NOTICE.txt name (should be NOTICE) and added to javadoc package
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1080512: 878508