[geronimo-jaxrpc] Update to latest packaging guidelines
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Aug 8 15:20:34 UTC 2013
commit 19e21b84b95aeb89ed1034e0e9ff28f6ec5be8ad
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu Aug 8 17:19:58 2013 +0200
Update to latest packaging guidelines
geronimo-jaxrpc.spec | 51 +++++++++++++------------------------------------
use_parent_pom.patch | 10 ---------
2 files changed, 14 insertions(+), 47 deletions(-)
---
diff --git a/geronimo-jaxrpc.spec b/geronimo-jaxrpc.spec
index fcb7e3e..ec07c25 100644
--- a/geronimo-jaxrpc.spec
+++ b/geronimo-jaxrpc.spec
@@ -3,16 +3,12 @@
Name: geronimo-jaxrpc
Version: 2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Java EE: Java API for XML Remote Procedure Call v1.1
-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
BuildRequires: java-devel >= 1:1.6.0
@@ -25,21 +21,13 @@ BuildRequires: geronimo-osgi-locator
BuildRequires: tomcat-servlet-3.0-api
BuildRequires: maven-surefire-provider-junit
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Requires: saaj_api
-Requires: geronimo-osgi-locator
-Requires: servlet >= 2.5
-
Provides: jaxrpc_api = %{spec_ver}
%description
-This package contains the core JAX-RPC APIs for the client programming model.
+This package contains the core JAX-RPC APIs for the client programming model.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -49,39 +37,28 @@ This package contains the API documentation for %{name}.
%setup -q -n %{spec_name}-%{version}
iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE
sed -i 's/\r//' LICENSE NOTICE
-%patch1 -p0
+# Use parent pom files instead of unavailable 'genesis-java5-flava'
+%pom_set_parent org.apache.geronimo.specs:specs:1.4
+
+%mvn_alias : javax.xml:jaxrpc-api
+%mvn_file : %{name} jaxrpc
%build
-mvn-rpmbuild \
- -Dmaven.local.depmap.file="%{SOURCE1}" \
- install javadoc:javadoc
+%mvn_build
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -s %{name}.jar %{buildroot}%{_javadir}/jaxrpc.jar
+%mvn_install
-# poms
-install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a javax.xml:jaxrpc-api
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Thu Aug 08 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.1-13
+- Update to latest packaging guidelines
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list