[apache-juddi] Build with xmvn

Mikolaj Izdebski mizdebsk at fedoraproject.org
Tue Jan 8 18:54:14 UTC 2013


commit 4c048d9c53f964e6c6a698d2c2418cefa0cfaf9c
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Jan 8 19:32:03 2013 +0100

    Build with xmvn

 apache-juddi.spec |   53 ++++++++++-------------------------------------------
 1 files changed, 10 insertions(+), 43 deletions(-)
---
diff --git a/apache-juddi.spec b/apache-juddi.spec
index 005534f..12fbe5e 100644
--- a/apache-juddi.spec
+++ b/apache-juddi.spec
@@ -1,6 +1,6 @@
 Name:             apache-juddi
 Version:          3.1.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Client API for UDDI
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -16,21 +16,12 @@ Patch3:           0003-Disable-ReadWSDLTest.readFromJar.patch
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
-BuildRequires:    maven
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    xmvn
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    jboss-jaxws-2.2-api
 BuildRequires:    wsdl4j
 
-Requires:         jpackage-utils
-Requires:         java
-Requires:         jboss-jaxws-2.2-api
-Requires:         wsdl4j
-
 %description
 jUDDI is an open source Java implementation of the Universal Description,
 Discovery, and Integration (UDDI v3) specification for Web Services.
@@ -47,50 +38,26 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}
-
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
 %build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-for m in uddi-ws juddi-client; do
-  # JAR
-  install -pm 644 ${m}/target/${m}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/${m}.jar
-
-  # POM
-  install -pm 644 ${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-${m}.pom
+%mvn_install
 
-  # DEPMAP
-  %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
-done
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom
-
-#DEPMAP
-%add_maven_depmap JPP.%{name}-parent.pom
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc RELEASE_NOTES.html LICENSE NOTICE
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan  8 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.1.4-2
+- Build with xmvn
+
 * Tue Dec 11 2012 Michal Srb <msrb at redhat.com> - 3.1.4-1
 - Update to version 3.1.4 (Resolves: #880506)
 


More information about the scm-commits mailing list