[geronimo-jaspic-spec] Build with xmvn
Michal Srb
msrb at fedoraproject.org
Mon Jan 21 14:26:43 UTC 2013
commit 754ef9d5f35dd09853600a3b079fe64a8cd803cc
Author: Michal Srb <msrb at redhat.com>
Date: Thu Jan 17 09:00:09 2013 +0100
Build with xmvn
geronimo-jaspic-spec.spec | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
---
diff --git a/geronimo-jaspic-spec.spec b/geronimo-jaspic-spec.spec
index 6f81e23..10b12f5 100644
--- a/geronimo-jaspic-spec.spec
+++ b/geronimo-jaspic-spec.spec
@@ -2,7 +2,7 @@
%define pkg_name geronimo-jaspic_%{api_version}_spec
Name: geronimo-jaspic-spec
Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java Authentication SPI for Containers
License: ASL 2.0 and W3C
Group: Development/Libraries
@@ -12,15 +12,12 @@ Source0: http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{pkg_nam
BuildArch: noarch
BuildRequires: java-devel
-BuildRequires: maven
+BuildRequires: xmvn
BuildRequires: maven-plugin-bundle
BuildRequires: geronimo-osgi-support
BuildRequires: geronimo-parent-poms
BuildRequires: jpackage-utils
-Requires: java
-Requires: jpackage-utils
-
%description
Java Authentication Service Provider Interface for Containers (JSR-196) api.
@@ -50,33 +47,22 @@ done
</parent>"
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file : %{name}
+%mvn_build
%install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{pkg_name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Thu Jan 17 2013 Michal Srb <msrb at redhat.com> - 1.1-4
+- Build with xmvn
+
* Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-3
- Fix license tag
More information about the scm-commits
mailing list