[geronimo-jaxrpc] Remove use of depmap

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Aug 4 10:23:40 UTC 2014


commit 1223596852e66c9d7b05af020eb2422db1d31fe8
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Aug 4 12:20:22 2014 +0200

    Remove use of depmap

 geronimo-jaxrpc.depmap |   13 -------------
 geronimo-jaxrpc.spec   |   18 +++++-------------
 2 files changed, 5 insertions(+), 26 deletions(-)
---
diff --git a/geronimo-jaxrpc.spec b/geronimo-jaxrpc.spec
index f327f05..ad8fddd 100644
--- a/geronimo-jaxrpc.spec
+++ b/geronimo-jaxrpc.spec
@@ -3,13 +3,12 @@
 
 Name:             geronimo-jaxrpc
 Version:          2.1
-Release:          15%{?dist}
+Release:          16%{?dist}
 Summary:          Java EE: Java API for XML Remote Procedure Call v1.1
 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
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -19,7 +18,7 @@ BuildRequires:    geronimo-parent-poms
 BuildRequires:    maven-resources-plugin
 BuildRequires:    saaj_api
 BuildRequires:    geronimo-osgi-locator
-BuildRequires:    tomcat-servlet-3.0-api
+BuildRequires:    glassfish-servlet-api
 BuildRequires:    maven-surefire-provider-junit
 
 Provides:         jaxrpc_api = %{spec_ver}
@@ -44,16 +43,6 @@ sed -i 's/\r//' LICENSE NOTICE
 %mvn_alias : javax.xml:jaxrpc-api
 %mvn_file : %{name} jaxrpc
 
-cat >>.xmvn/config.d/mvn-rpmbuild-config.xml <<EOF
-<configuration>
-  <resolverSettings>
-    <metadataRepositories>
-      <repository>%{SOURCE1}</repository>
-    </metadataRepositories>
-  </resolverSettings>
-</configuration>
-EOF
-
 %build
 %mvn_build
 
@@ -67,6 +56,9 @@ EOF
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-16
+- Remove use of depmap
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list