[geronimo-saaj] Build with Maven 3.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Nov 30 07:46:51 UTC 2011
commit 513992becb48d3d26c5d120ff158c97e3b2fa5f6
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Wed Nov 30 09:32:35 2011 +0200
Build with Maven 3.
- Adapt to current guidelines.
geronimo-saaj.spec | 39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)
---
diff --git a/geronimo-saaj.spec b/geronimo-saaj.spec
index a492383..c6c2d76 100644
--- a/geronimo-saaj.spec
+++ b/geronimo-saaj.spec
@@ -3,7 +3,7 @@
Name: geronimo-saaj
Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java EE: SOAP with Attachments API Package v1.3
Group: Development/Libraries
License: ASL 2.0
@@ -13,12 +13,11 @@ Source0: http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec
Source1: %{name}.depmap
# Use parent pom files instead of unavailable 'genesis-java5-flava'
Patch1: use_parent_pom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2 >= 2.2.1
+BuildRequires: maven
BuildRequires: geronimo-parent-poms
BuildRequires: maven-resources-plugin
BuildRequires: geronimo-osgi-locator
@@ -52,21 +51,14 @@ sed -i 's/\r//' LICENSE
%patch1 -p0
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+ -Dmaven.local.depmap.file="%{SOURCE1}" \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/saaj.jar
# poms
@@ -77,33 +69,24 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap javax.xml.soap saaj-api %{spec_ver} JPP %{name}
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%files
-%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 1.1-5
+- Build with Maven 3.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list