SPECS: ant.spec - require log4j >= 1.2 (for org.apache.log4j.Logge...

qboosh qboosh at pld-linux.org
Sun Jan 7 14:01:41 CET 2007


Author: qboosh                       Date: Sun Jan  7 13:01:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- require log4j >= 1.2 (for org.apache.log4j.Logger); fixed apache_log4j bcond

---- Files affected:
SPECS:
   ant.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.72 SPECS/ant.spec:1.73
--- SPECS/ant.spec:1.72	Sun Jan  7 13:42:59 2007
+++ SPECS/ant.spec	Sun Jan  7 14:01:36 2007
@@ -64,7 +64,7 @@
 %{?with_jsch:BuildRequires:	jsch >= 0.1.21}
 %{?with_junit:BuildRequires:	junit}
 %{?with_apache_bsf:BuildRequires:	jython}
-%{?with_apache_log4j:BuildRequires:	logging-log4j}
+%{?with_apache_log4j:BuildRequires:	logging-log4j >= 1.2}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jdk
@@ -232,7 +232,7 @@
 Summary(pl):	Opcjonalne zadania apache log4j dla anta
 Group:		Development/Languages/Java
 Requires:	%{name} = %{version}-%{release}
-Requires:	logging-log4j
+Requires:	logging-log4j >= 1.2
 Provides:	ant-jakarta-log4j = %{version}-%{release}
 Obsoletes:	ant-jakarta-log4j
 Conflicts:	ant-optional-clean
@@ -351,7 +351,7 @@
 Summary(pl):	Opcjonalne zadania jsch dla anta
 Group:		Development/Languages/Java
 Requires:	%{name} = %{version}-%{release}
-Requires:	jsch
+Requires:	jsch >= 0.1.21
 Conflicts:	ant-optional-clean
 Conflicts:	ant-optional-full
 
@@ -517,7 +517,7 @@
 %{?with_commons_net:required_jars="$required_jars jakarta-commons-net"}
 %{?with_jai:required_jars="$required_jars jait"}
 %{?with_apache_bcel:required_jars="$required_jars bcel"}
-%{?with_log4j:required_jars="$required_jars log4j"}
+%{?with_apache_log4j:required_jars="$required_jars log4j"}
 %{?with_apache_oro:required_jars="$required_jars oro"}
 %{?with_apache_regexp:required_jars="$required_jars regexp"}
 %{?with_javamail:required_jars="$required_jars mailapi activation"}
@@ -845,6 +845,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2007/01/07 13:01:36  qboosh
+- require log4j >= 1.2 (for org.apache.log4j.Logger); fixed apache_log4j bcond
+
 Revision 1.72  2007/01/07 12:42:59  qboosh
 - BR: jsch >= 0.1.21 (for com.jcraft.jsch.ChannelSftp.LsEntry class)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.72&r2=1.73&f=u



More information about the pld-cvs-commit mailing list