Author: glen Date: Sun May 21 12:33:11 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- adapter
- no point to unset JAVA_HOME if it's set on next line ;)
---- Files affected:
SPECS:
ant.spec (1.51 -> 1.52)
---- Diffs:
================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.51 SPECS/ant.spec:1.52
--- SPECS/ant.spec:1.51 Sun May 21 13:13:04 2006
+++ SPECS/ant.spec Sun May 21 14:33:05 2006
@@ -52,20 +52,20 @@
%{?with_antlr:BuildRequires: antlr}
%{?with_bsf:BuildRequires: beanshell}
%{?with_bsf:BuildRequires: bsf}
+%{?with_javamail:BuildRequires: jaf}
%{?with_bcel:BuildRequires: jakarta-bcel}
%{?with_commons_logging:BuildRequires: jakarta-commons-logging}
%{?with_commons_net:BuildRequires: jakarta-commons-net}
%{?with_apache_log4j:BuildRequires: jakarta-log4j}
%{?with_apache_oro:BuildRequires: jakarta-oro}
%{?with_apache_regexp:BuildRequires: jakarta-regexp}
-%{?with_javamail:BuildRequires: jaf}
%{?with_javamail:BuildRequires: javamail}
+BuildRequires: jaxp_parser_impl
BuildRequires: jdk
+BuildRequires: jpackage-utils
%{?with_jsch:BuildRequires: jsch}
%{?with_junit:BuildRequires: junit}
%{?with_bsf:BuildRequires: jython}
-BuildRequires: jaxp_parser_impl
-BuildRequires: jpackage-utils
BuildRequires: rpm-pythonprov
Requires: jdk
Requires: jpackage-utils
@@ -74,7 +74,6 @@
ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
%define ant_home %{_datadir}/ant
%description
@@ -100,7 +99,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: antlr
Provides: ant-antlr = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description antlr
Optional antlr tasks for %{name}.
@@ -114,7 +114,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bsf
Provides: ant-apache-bsf = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description apache-bsf
Optional apache bsf tasks for %{name}.
@@ -128,7 +129,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: xml-commons-resolver
Provides: ant-apache-resolver = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description apache-resolver
Optional apache resolver tasks for %{name}.
@@ -142,7 +144,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jakarta-commons-logging
Provides: ant-commons-logging = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description commons-logging
Optional commons logging tasks for %{name}.
@@ -156,7 +159,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jakarta-commons-net
Provides: ant-commons-net = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description commons-net
Optional commons net tasks for %{name}.
@@ -170,7 +174,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jai
Provides: ant-jai = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description jai
Optional jai tasks for %{name}.
@@ -186,7 +191,8 @@
Provides: ant-apache-bcel = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-bcel = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-bcel
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description apache-bcel
Optional apache bcel tasks for %{name}.
@@ -202,7 +208,8 @@
Provides: ant-apache-log4j = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-log4j = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-log4j
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description apache-log4j
Optional apache log4j tasks for %{name}.
@@ -218,7 +225,8 @@
Provides: ant-apache-oro = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-oro
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description apache-oro
Optional apache oro tasks for %{name}.
@@ -234,7 +242,8 @@
Provides: ant-apache-regexp = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-regexp = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-regexp
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description apache-regexp
Optional apache regexp tasks for %{name}.
@@ -249,7 +258,8 @@
Requires: jaf >= 0:1.0.1-5jpp
Requires: javamail >= 0:1.2-5jpp
Provides: ant-javamail = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description javamail
Optional javamail tasks for %{name}.
@@ -263,7 +273,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jdepend
Provides: ant-jdepend = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description jdepend
Optional jdepend tasks for %{name}.
@@ -276,7 +287,8 @@
Group: Development/Languages/Java
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: ant-jmf = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description jmf
Optional jmf tasks for %{name}.
@@ -290,7 +302,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jsch
Provides: ant-jsch = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description jsch
Optional jsch tasks for %{name}.
@@ -304,7 +317,8 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: junit
Provides: ant-junit = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description junit
Optional junit tasks for %{name}.
@@ -317,7 +331,8 @@
Group: Development/Languages/Java
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: ant-nodeps = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description nodeps
Optional tasks for %{name}.
@@ -330,7 +345,8 @@
Group: Development/Languages/Java
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: ant-swing = %{epoch}:%{version}-%{release}
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description swing
Optional swing tasks for %{name}.
@@ -346,7 +362,8 @@
Provides: ant-trax = %{epoch}:%{version}-%{release}
# The ant-xalan jar has been merged into the ant-trax one
Obsoletes: ant-xalan2
-Conflicts: ant-optional-clean, ant-optional-full
+Conflicts: ant-optional-clean
+Conflicts: ant-optional-full
%description trax
Optional trax tasks for %{name}.
@@ -404,9 +421,7 @@
find . -name "*.jar" -exec rm -f {} \;
%build
-
-unset JAVA_HOME || :
-export JAVA_HOME="%{java_home}"
+export JAVA_HOME="%{java_home}"
required_jars="jaxp_parser_impl"
%{?with_junit:required_jars="$required_jars junit"}
@@ -744,6 +759,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.52 2006/05/21 12:33:05 glen
+- adapter
+- no point to unset JAVA_HOME if it's set on next line ;)
+
Revision 1.51 2006/05/21 11:13:04 jajcus
- Release: 1.2 (for bootstrap build for Ac)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.51&r2=1.52&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
