[geronimo-saaj] Replace local depmap with POM macro
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Mar 12 08:31:06 UTC 2013
commit a22e8443795315b3b960b67f57b66e6d7e0139bd
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Mar 12 09:19:07 2013 +0100
Replace local depmap with POM macro
- Resolves: rhbz#914030
geronimo-saaj.depmap | 8 --------
geronimo-saaj.spec | 12 +++++++-----
2 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/geronimo-saaj.spec b/geronimo-saaj.spec
index 1b5c2e6..bc077b8 100644
--- a/geronimo-saaj.spec
+++ b/geronimo-saaj.spec
@@ -3,14 +3,13 @@
Name: geronimo-saaj
Version: 1.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Java EE: SOAP with Attachments API Package v1.3
Group: Development/Libraries
License: ASL 2.0 and W3C
URL: http://geronimo.apache.org/
Source0: http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec_name}/%{version}/%{spec_name}-%{version}-source-release.tar.gz
-Source1: %{name}.depmap
# Use parent pom files instead of unavailable 'genesis-java5-flava'
Patch1: use_parent_pom.patch
BuildArch: noarch
@@ -47,11 +46,10 @@ This package contains the API documentation for %{name}.
iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE
sed -i 's/\r//' LICENSE NOTICE
%patch1 -p0
+%pom_remove_dep :geronimo-activation_1.1_spec
%build
-mvn-rpmbuild \
- -Dmaven.local.depmap.file="%{SOURCE1}" \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
install -d -m 755 %{buildroot}%{_javadir}
@@ -76,6 +74,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Mar 12 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-11
+- Replace local depmap with POM macro
+- Resolves: rhbz#914030
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list