[jboss-jaspi-1.0-api] Rebuild with xmvn

Marek Goldmann goldmann at fedoraproject.org
Mon Oct 21 12:36:03 UTC 2013


commit 497a5d405d020cfb02e0e3fd00112886dff68548
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Oct 21 14:36:03 2013 +0200

    Rebuild with xmvn

 jboss-jaspi-1.0-api.spec |   35 +++++++++--------------------------
 1 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/jboss-jaspi-1.0-api.spec b/jboss-jaspi-1.0-api.spec
index 7682c7e..135875e 100644
--- a/jboss-jaspi-1.0-api.spec
+++ b/jboss-jaspi-1.0-api.spec
@@ -3,7 +3,7 @@
 
 Name:		jboss-jaspi-1.0-api
 Version:	1.0.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	JBoss Java Authentication SPI for Containers 1.0 API
 Group:		Development/Libraries
 License:	CDDL or GPLv2 with exceptions
@@ -13,8 +13,6 @@ URL:		http://www.jboss.org
 # cd jboss-jaspi-api_spec/ && git archive --format=tar --prefix=jboss-jaspi-1.0-api/ jboss-jaspi-api_1.0_spec-1.0.1.Final | xz > jboss-jaspi-1.0-api-1.0.1.Final.tar.xz
 Source0:	%{name}-%{namedversion}.tar.xz
 
-BuildRequires:	jpackage-utils
-BuildRequires:	java-devel
 BuildRequires:	maven-local
 BuildRequires:	jboss-logging
 BuildRequires:	maven-compiler-plugin
@@ -23,9 +21,6 @@ BuildRequires:	maven-install-plugin
 BuildRequires:	maven-jar-plugin
 BuildRequires:	maven-javadoc-plugin
 
-Requires:	jpackage-utils
-Requires:	java
-
 BuildArch:	noarch
 
 %description
@@ -58,34 +53,22 @@ for f in ${files}; do
 done
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/jboss-jaspi-api_1.0_spec-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
 
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE README
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE README
 
 %changelog
+* Mon Oct 21 2013 Marek Goldmann <mgoldman at redhat.com> - 1.0.1-7
+- Rebuild with xmvn
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list