pool/ant
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 147382 from Java:packages

Browse Source 
- remove xerces-j2-bootstrap depenency (bnc#789163)

OBS-URL: https://build.opensuse.org/request/show/147382
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=43
This commit is contained in:
Stephan Kulow 2013-01-08 12:32:39 +00:00 committed by Git OBS Bridge
commit bcd0ec657b
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ant-antlr.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ant-antlr
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@ -66,7 +66,8 @@ BuildRequires: java-devel >= 1.5.0
BuildRequires: antlr-bootstrap
BuildRequires: jpackage-utils >= 1.7.5
BuildRequires: unzip
BuildRequires: xerces-j2-bootstrap
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if ! %bootstrap
BuildRequires: ant = %{version}
@ -80,7 +81,7 @@ BuildRequires: xml-commons-apis
Requires: java-devel >= 1.5.0
Requires: jaxp_parser_impl
Requires: jpackage-utils >= 1.7.5
Requires: xerces-j2 >= 2.7.1-2
#Requires: xerces-j2 >= 2.7.1-2
Requires: xml-commons-apis
Requires: xml-commons-resolver
Obsoletes: apache-ant < %{version}
@ -353,7 +354,7 @@ Optional apache xalan2 tasks for %{name}.
%package -n ant-javamail
Summary: Optional javamail tasks for ant
License: Other uncritical OpenSource License ; Common Development and Distribution License
License: CDDL-1.0
Group: Development/Tools/Building
BuildRequires: javamail >= 1.2-5jpp
Requires: javamail >= 1.2-5jpp

5
ant.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 7 12:15:09 UTC 2013 - mvyskocil@suse.com
- remove xerces-j2-bootstrap depenency (bnc#789163)
-------------------------------------------------------------------
Wed May 30 11:46:44 UTC 2012 - cfarrell@suse.com

7
ant.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ant
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@ -65,7 +65,8 @@ BuildRequires: java-devel >= 1.5.0
BuildRequires: antlr-bootstrap
BuildRequires: jpackage-utils >= 1.7.5
BuildRequires: unzip
BuildRequires: xerces-j2-bootstrap
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
%if ! %bootstrap
BuildRequires: ant = %{version}
@ -79,7 +80,7 @@ BuildRequires: xml-commons-apis
Requires: java-devel >= 1.5.0
Requires: jaxp_parser_impl
Requires: jpackage-utils >= 1.7.5
Requires: xerces-j2 >= 2.7.1-2
#Requires: xerces-j2 >= 2.7.1-2
Requires: xml-commons-apis
Requires: xml-commons-resolver
Obsoletes: apache-ant < %{version}