Accepting request 198678 from Java:packages

jpackage-utils collison fix

OBS-URL: https://build.opensuse.org/request/show/198678
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/axis?expand=0&rev=21
This commit is contained in:
Tomáš Chvátal 2013-09-12 15:04:56 +00:00 committed by Git OBS Bridge
commit 3eed863891
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 9 11:05:31 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Tue Feb 28 09:12:20 UTC 2012 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
#
# spec file for package axis
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -54,7 +54,7 @@ BuildRequires: jakarta-commons-discovery
BuildRequires: jakarta-commons-httpclient3
BuildRequires: jakarta-commons-logging
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini
BuildRequires: servletapi5
@ -67,8 +67,8 @@ Requires: jakarta-commons-httpclient3
Requires: jakarta-commons-logging
Requires: java
Requires: javamail
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: jpackage-utils >= 1.5
Requires: log4j
Requires: wsdl4j
BuildArch: noarch