diff --git a/ant-antlr.spec b/ant-antlr.spec index 767c518..35fa933 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -59,29 +59,30 @@ Patch4: apache-ant-class-path-in-manifest.patch %if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel %else BuildRequires: java-devel >= 1.5.0 %endif -BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: antlr-bootstrap +BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: unzip BuildRequires: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap -BuildRequires: xalan-j2 BuildRequires: ant = %{version} BuildRequires: junit -BuildRequires: xml-commons-apis +BuildRequires: xalan-j2 BuildRequires: xerces-j2 +BuildRequires: xml-commons-apis #!BuildIgnore: antlr %endif %if %bootstrap -Requires: xerces-j2 >= 2.7.1-2 +Requires: java-devel >= 1.5.0 Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.7.5 +Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver -Requires: jpackage-utils >= 1.7.5 -Requires: java-devel >= 1.5.0 Obsoletes: apache-ant < %{version} Provides: apache-ant = %{version} Obsoletes: ant-nodeps < %{version} @@ -90,8 +91,8 @@ Obsoletes: ant-trax < %{version} Provides: ant-trax = %{version} %else # ant-antlr requires -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: antlr +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-antlr = %{version}-%{release} %endif BuildArch: noarch @@ -171,9 +172,9 @@ This package contains optional swing tasks for Apache Ant. Summary: Additional scripts for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %{version} Requires: %{_bindir}/perl Requires: %{_bindir}/python +Requires: ant = %{version} %description -n ant-scripts Apache Ant is a Java-based build tool. @@ -190,8 +191,8 @@ Ant. Summary: Optional apache bsf tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: bsf +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: bsf Provides: ant-apache-bsf = %{version}-%{release} @@ -206,8 +207,8 @@ This package contains optional apache bsf tasks for Apache Ant. Summary: Optional apache resolver tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: xml-commons-resolver +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: xml-commons-resolver Provides: ant-apache-resolver = %{version}-%{release} @@ -222,8 +223,8 @@ This package contains optional apache resolver tasks for Apache Ant. Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jakarta-commons-logging +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jakarta-commons-logging Provides: ant-commons-logging = %{version}-%{release} @@ -238,8 +239,8 @@ This package contains optional commons logging tasks for Apache Ant. Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jakarta-commons-net +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jakarta-commons-net Provides: ant-commons-net = %{version}-%{release} @@ -258,8 +259,8 @@ This package contains optional commons net tasks for Apache Ant. Summary: Optional jai tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jai +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jai Provides: ant-jai = %{version}-%{release} @@ -271,8 +272,8 @@ Optional jai tasks for ant. Summary: Optional apache bcel tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: bcel +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: bcel Provides: ant-apache-bcel = %{version} Provides: ant-jakarta-bcel = %{version} @@ -289,8 +290,8 @@ This package contains optional apache bcel tasks for Apache Ant. Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: log4j +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: log4j-mini Provides: ant-apache-log4j = %{version} Provides: ant-jakarta-log4j = %{version} @@ -307,8 +308,8 @@ This package contains optional apache log4j tasks for Apache Ant. Summary: Optional apache oro tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: oro +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: oro Provides: ant-apache-oro = %{version} Provides: ant-jakarta-oro = %{version} @@ -325,8 +326,8 @@ This package contains optional apache oro tasks for Apache Ant. Summary: Optional apache regexp tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: regexp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: regexp Provides: ant-apache-regexp = %{version} Provides: ant-jakarta-regexp = %{version} @@ -342,8 +343,8 @@ Summary: Optional apache xalan2 tasks for ant License: Apache-2.0 Group: Development/Tools/Building BuildRequires: regexp -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: regexp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-apache-xalan2 = %{version} %description -n ant-apache-xalan2 @@ -355,8 +356,8 @@ Summary: Optional javamail tasks for ant License: Other uncritical OpenSource License ; Common Development and Distribution License Group: Development/Tools/Building BuildRequires: javamail >= 1.2-5jpp -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: javamail >= 1.2-5jpp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-javamail = %{version} %description -n ant-javamail @@ -370,8 +371,8 @@ This package contains optional javamail tasks for Apache Ant. Summary: Optional jdepend tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jdepend +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jdepend Provides: ant-jdepend = %{version} @@ -386,8 +387,8 @@ This package contains optional jdepend tasks for Apache Ant. Summary: Optional jsch tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jsch +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jsch Provides: ant-jsch = %{version} @@ -402,8 +403,8 @@ This package contains optional jsch tasks for Apache Ant. Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: junit +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-junit = %{version} %description -n ant-junit @@ -415,8 +416,8 @@ This package contains optional JUnit tasks for Apache Ant. Summary: Test utility classes for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: junit +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-testutil = %{version} %description -n ant-testutil @@ -689,7 +690,6 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_datadir}/maven2/poms/JPP-ant-parent.pom %{_datadir}/maven2/poms/JPP-ant.pom %config(noreplace) %{_mavendepmapfragdir}/* -%config(noreplace) %dir %{_sysconfdir}/maven/fragments %dir %{_datadir}/maven2 %dir %{_datadir}/maven2/poms diff --git a/ant.changes b/ant.changes index 0f08b9d..839042a 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed May 30 11:46:44 UTC 2012 - cfarrell@suse.com + +- license update: CDDL-1.0 + SPDX format (note that it should CDDL-1.1 if the (c) owner and license + steward is Oracle) + +------------------------------------------------------------------- +Tue May 15 07:02:23 UTC 2012 - mvyskocil@suse.cz + +- build ignore java-1_7_0-openjdk as well + ------------------------------------------------------------------- Wed Feb 1 12:54:47 UTC 2012 - mvyskocil@suse.cz diff --git a/ant.spec b/ant.spec index 1b2823a..e6469c7 100644 --- a/ant.spec +++ b/ant.spec @@ -58,29 +58,30 @@ Patch4: apache-ant-class-path-in-manifest.patch %if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel %else BuildRequires: java-devel >= 1.5.0 %endif -BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: antlr-bootstrap +BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: unzip BuildRequires: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap -BuildRequires: xalan-j2 BuildRequires: ant = %{version} BuildRequires: junit -BuildRequires: xml-commons-apis +BuildRequires: xalan-j2 BuildRequires: xerces-j2 +BuildRequires: xml-commons-apis #!BuildIgnore: antlr %endif %if %bootstrap -Requires: xerces-j2 >= 2.7.1-2 +Requires: java-devel >= 1.5.0 Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.7.5 +Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver -Requires: jpackage-utils >= 1.7.5 -Requires: java-devel >= 1.5.0 Obsoletes: apache-ant < %{version} Provides: apache-ant = %{version} Obsoletes: ant-nodeps < %{version} @@ -89,8 +90,8 @@ Obsoletes: ant-trax < %{version} Provides: ant-trax = %{version} %else # ant-antlr requires -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: antlr +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-antlr = %{version}-%{release} %endif BuildArch: noarch @@ -170,9 +171,9 @@ This package contains optional swing tasks for Apache Ant. Summary: Additional scripts for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %{version} Requires: %{_bindir}/perl Requires: %{_bindir}/python +Requires: ant = %{version} %description -n ant-scripts Apache Ant is a Java-based build tool. @@ -189,8 +190,8 @@ Ant. Summary: Optional apache bsf tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: bsf +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: bsf Provides: ant-apache-bsf = %{version}-%{release} @@ -205,8 +206,8 @@ This package contains optional apache bsf tasks for Apache Ant. Summary: Optional apache resolver tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: xml-commons-resolver +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: xml-commons-resolver Provides: ant-apache-resolver = %{version}-%{release} @@ -221,8 +222,8 @@ This package contains optional apache resolver tasks for Apache Ant. Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jakarta-commons-logging +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jakarta-commons-logging Provides: ant-commons-logging = %{version}-%{release} @@ -237,8 +238,8 @@ This package contains optional commons logging tasks for Apache Ant. Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jakarta-commons-net +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jakarta-commons-net Provides: ant-commons-net = %{version}-%{release} @@ -257,8 +258,8 @@ This package contains optional commons net tasks for Apache Ant. Summary: Optional jai tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jai +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jai Provides: ant-jai = %{version}-%{release} @@ -270,8 +271,8 @@ Optional jai tasks for ant. Summary: Optional apache bcel tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: bcel +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: bcel Provides: ant-apache-bcel = %{version} Provides: ant-jakarta-bcel = %{version} @@ -288,8 +289,8 @@ This package contains optional apache bcel tasks for Apache Ant. Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: log4j +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: log4j-mini Provides: ant-apache-log4j = %{version} Provides: ant-jakarta-log4j = %{version} @@ -306,8 +307,8 @@ This package contains optional apache log4j tasks for Apache Ant. Summary: Optional apache oro tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: oro +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: oro Provides: ant-apache-oro = %{version} Provides: ant-jakarta-oro = %{version} @@ -324,8 +325,8 @@ This package contains optional apache oro tasks for Apache Ant. Summary: Optional apache regexp tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: regexp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: regexp Provides: ant-apache-regexp = %{version} Provides: ant-jakarta-regexp = %{version} @@ -341,8 +342,8 @@ Summary: Optional apache xalan2 tasks for ant License: Apache-2.0 Group: Development/Tools/Building BuildRequires: regexp -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: regexp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-apache-xalan2 = %{version} %description -n ant-apache-xalan2 @@ -351,11 +352,11 @@ 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: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: javamail >= 1.2-5jpp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-javamail = %{version} %description -n ant-javamail @@ -369,8 +370,8 @@ This package contains optional javamail tasks for Apache Ant. Summary: Optional jdepend tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jdepend +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jdepend Provides: ant-jdepend = %{version} @@ -385,8 +386,8 @@ This package contains optional jdepend tasks for Apache Ant. Summary: Optional jsch tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jsch +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) BuildRequires: jsch Provides: ant-jsch = %{version} @@ -401,8 +402,8 @@ This package contains optional jsch tasks for Apache Ant. Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: junit +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-junit = %{version} %description -n ant-junit @@ -414,8 +415,8 @@ This package contains optional JUnit tasks for Apache Ant. Summary: Test utility classes for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: junit +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-testutil = %{version} %description -n ant-testutil