[jboss-transaction-1.1-api] Switch to xmvn
Marek Goldmann
goldmann at fedoraproject.org
Wed Jul 2 09:35:19 UTC 2014
commit 7d92926a691e3ccb87a77ab215cb1f2a5fd99bb0
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed Jul 2 11:35:24 2014 +0200
Switch to xmvn
jboss-transaction-1.1-api.spec | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/jboss-transaction-1.1-api.spec b/jboss-transaction-1.1-api.spec
index b5cc7ac..7aaa77f 100644
--- a/jboss-transaction-1.1-api.spec
+++ b/jboss-transaction-1.1-api.spec
@@ -3,7 +3,7 @@
Name: jboss-transaction-1.1-api
Version: 1.0.1
-Release: 8%{dist}
+Release: 9%{dist}
Summary: Transaction 1.1 API
Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
@@ -15,7 +15,6 @@ Source0: %{name}-%{namedversion}.tar.xz
BuildRequires: java-devel
BuildRequires: jboss-specs-parent
-BuildRequires: jpackage-utils
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -28,7 +27,6 @@ BuildRequires: maven-ear-plugin
BuildRequires: maven-clean-plugin
BuildRequires: maven-ejb-plugin
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -37,7 +35,6 @@ The Java Transaction 1.1 API classes.
%package javadoc
Summary: Javadocs for %{name}
Group: Development/Libraries
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -46,36 +43,22 @@ This package contains the API documentation for %{name}.
%setup -q -n jboss-transaction-1.1-api
%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}
+%mvn_install
-# JAR
-install -pm 644 target/jboss-transaction-api_1.1_spec-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc README LICENSE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Wed Jul 02 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.1-9
+- Switch to xmvn
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list