This commit is contained in:
parent
a46d1d0a82
commit
54ff3baeb7
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun May 3 11:37:46 CEST 2009 - ro@suse.de
|
||||
|
||||
- do not assume release number for ant and ant-antlr are identical
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 28 15:17:09 CEST 2009 - mvyskocil@suse.cz
|
||||
|
||||
|
@ -29,7 +29,7 @@ Name: ant-antlr
|
||||
# This line is not a comment, please do not remove it!
|
||||
#%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
|
||||
Version: 1.7.1
|
||||
Release: 2
|
||||
Release: 3
|
||||
%if %bootstrap
|
||||
Summary: Optional antlr Tasks for Ant
|
||||
%else
|
||||
@ -97,7 +97,7 @@ Requires: jpackage-utils >= 1.7.5
|
||||
Requires: java-devel >= 1.5.0
|
||||
%else
|
||||
# ant-antlr requires
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: antlr
|
||||
Provides: ant-antlr = %{version}-%{release}
|
||||
%endif
|
||||
@ -208,7 +208,7 @@ Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache bsf tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: bsf
|
||||
BuildRequires: bsf
|
||||
Provides: ant-apache-bsf = %{version}-%{release}
|
||||
@ -224,7 +224,7 @@ This package contains optional apache bsf tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache resolver tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: xml-commons-resolver
|
||||
BuildRequires: xml-commons-resolver
|
||||
Provides: ant-apache-resolver = %{version}-%{release}
|
||||
@ -240,7 +240,7 @@ This package contains optional apache resolver tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional commons logging tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jakarta-commons-logging
|
||||
BuildRequires: jakarta-commons-logging
|
||||
Provides: ant-commons-logging = %{version}-%{release}
|
||||
@ -256,7 +256,7 @@ This package contains optional commons logging tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional commons net tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jakarta-commons-net
|
||||
BuildRequires: jakarta-commons-net
|
||||
Provides: ant-commons-net = %{version}-%{release}
|
||||
@ -274,7 +274,7 @@ This package contains optional commons net tasks for Apache Ant.
|
||||
|
||||
Summary: Optional jai tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jai
|
||||
BuildRequires: jai
|
||||
Provides: ant-jai = %{version}-%{release}
|
||||
@ -287,7 +287,7 @@ Optional jai tasks for ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache bcel tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: bcel
|
||||
BuildRequires: bcel
|
||||
Provides: ant-apache-bcel = %{version}-%{release}
|
||||
@ -305,7 +305,7 @@ This package contains optional apache bcel tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache log4j tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: log4j
|
||||
BuildRequires: log4j
|
||||
Provides: ant-apache-log4j = %{version}-%{release}
|
||||
@ -323,7 +323,7 @@ This package contains optional apache log4j tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache oro tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: oro
|
||||
BuildRequires: oro
|
||||
Provides: ant-apache-oro = %{version}-%{release}
|
||||
@ -341,7 +341,7 @@ This package contains optional apache oro tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache regexp tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: regexp
|
||||
BuildRequires: regexp
|
||||
Provides: ant-apache-regexp = %{version}-%{release}
|
||||
@ -359,7 +359,7 @@ This package contains optional apache regexp tasks for Apache Ant.
|
||||
License: Other uncritical OpenSource License; Common Development and Distribution License
|
||||
Summary: Optional javamail tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: javamail >= 1.2-5jpp
|
||||
Requires: jaf >= 1.0.1-5jpp
|
||||
BuildRequires: javamail >= 1.2-5jpp
|
||||
@ -377,7 +377,7 @@ This package contains optional javamail tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional jdepend tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jdepend
|
||||
BuildRequires: jdepend
|
||||
Provides: ant-jdepend = %{version}-%{release}
|
||||
@ -393,7 +393,7 @@ This package contains optional jdepend tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional jsch tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jsch
|
||||
BuildRequires: jsch
|
||||
Provides: ant-jsch = %{version}-%{release}
|
||||
@ -409,7 +409,7 @@ This package contains optional jsch tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional junit tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: junit
|
||||
Provides: ant-junit = %{version}-%{release}
|
||||
|
||||
@ -884,6 +884,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun May 03 2009 ro@suse.de
|
||||
- do not assume release number for ant and ant-antlr are identical
|
||||
* Tue Apr 28 2009 mvyskocil@suse.cz
|
||||
- update to 1.7.1. Upstream changes (full list is in WHATSNEW):
|
||||
* String resources only have properties single expanded. If you relied on
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun May 3 11:37:14 CEST 2009 - ro@suse.de
|
||||
|
||||
- do not assume release number for ant and ant-antlr are identical
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 28 15:03:07 CEST 2009 - mvyskocil@suse.cz
|
||||
|
||||
|
32
ant.spec
32
ant.spec
@ -28,7 +28,7 @@ Name: ant
|
||||
# This line is not a comment, please do not remove it!
|
||||
#%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name})
|
||||
Version: 1.7.1
|
||||
Release: 2
|
||||
Release: 3
|
||||
%if %bootstrap
|
||||
Summary: A Java-Based Build Tool
|
||||
%else
|
||||
@ -96,7 +96,7 @@ Requires: jpackage-utils >= 1.7.5
|
||||
Requires: java-devel >= 1.5.0
|
||||
%else
|
||||
# ant-antlr requires
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: antlr
|
||||
Provides: ant-antlr = %{version}-%{release}
|
||||
%endif
|
||||
@ -267,7 +267,7 @@ Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache bsf tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: bsf
|
||||
BuildRequires: bsf
|
||||
Provides: ant-apache-bsf = %{version}-%{release}
|
||||
@ -283,7 +283,7 @@ This package contains optional apache bsf tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache resolver tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: xml-commons-resolver
|
||||
BuildRequires: xml-commons-resolver
|
||||
Provides: ant-apache-resolver = %{version}-%{release}
|
||||
@ -299,7 +299,7 @@ This package contains optional apache resolver tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional commons logging tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jakarta-commons-logging
|
||||
BuildRequires: jakarta-commons-logging
|
||||
Provides: ant-commons-logging = %{version}-%{release}
|
||||
@ -315,7 +315,7 @@ This package contains optional commons logging tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional commons net tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jakarta-commons-net
|
||||
BuildRequires: jakarta-commons-net
|
||||
Provides: ant-commons-net = %{version}-%{release}
|
||||
@ -333,7 +333,7 @@ This package contains optional commons net tasks for Apache Ant.
|
||||
|
||||
Summary: Optional jai tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jai
|
||||
BuildRequires: jai
|
||||
Provides: ant-jai = %{version}-%{release}
|
||||
@ -346,7 +346,7 @@ Optional jai tasks for ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache bcel tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: bcel
|
||||
BuildRequires: bcel
|
||||
Provides: ant-apache-bcel = %{version}-%{release}
|
||||
@ -364,7 +364,7 @@ This package contains optional apache bcel tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache log4j tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: log4j
|
||||
BuildRequires: log4j
|
||||
Provides: ant-apache-log4j = %{version}-%{release}
|
||||
@ -382,7 +382,7 @@ This package contains optional apache log4j tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache oro tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: oro
|
||||
BuildRequires: oro
|
||||
Provides: ant-apache-oro = %{version}-%{release}
|
||||
@ -400,7 +400,7 @@ This package contains optional apache oro tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional apache regexp tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: regexp
|
||||
BuildRequires: regexp
|
||||
Provides: ant-apache-regexp = %{version}-%{release}
|
||||
@ -418,7 +418,7 @@ This package contains optional apache regexp tasks for Apache Ant.
|
||||
License: Other uncritical OpenSource License; Common Development and Distribution License
|
||||
Summary: Optional javamail tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: javamail >= 1.2-5jpp
|
||||
Requires: jaf >= 1.0.1-5jpp
|
||||
BuildRequires: javamail >= 1.2-5jpp
|
||||
@ -436,7 +436,7 @@ This package contains optional javamail tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional jdepend tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jdepend
|
||||
BuildRequires: jdepend
|
||||
Provides: ant-jdepend = %{version}-%{release}
|
||||
@ -452,7 +452,7 @@ This package contains optional jdepend tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional jsch tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: jsch
|
||||
BuildRequires: jsch
|
||||
Provides: ant-jsch = %{version}-%{release}
|
||||
@ -468,7 +468,7 @@ This package contains optional jsch tasks for Apache Ant.
|
||||
License: The Apache Software License
|
||||
Summary: Optional junit tasks for ant
|
||||
Group: Development/Tools/Building
|
||||
Requires: ant = %{version}-%{release}
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' ant`)
|
||||
Requires: junit
|
||||
Provides: ant-junit = %{version}-%{release}
|
||||
|
||||
@ -943,6 +943,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun May 03 2009 ro@suse.de
|
||||
- do not assume release number for ant and ant-antlr are identical
|
||||
* Tue Apr 28 2009 mvyskocil@suse.cz
|
||||
- update to 1.7.1. Upstream changes (full list is in WHATSNEW):
|
||||
* String resources only have properties single expanded. If you relied on
|
||||
|
Loading…
x
Reference in New Issue
Block a user