Author: pawelz Date: Tue Feb 3 13:14:47 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added tests bcond (disabled by default, see TODO)
- BR: ant >= 1.7.1-4 (1.7 because of rmic=forking, 1.7.1-4 because of
source/target attributes used with gcj)
- added path1 (source/target=1.3; min level supported by gcj)
- use gcj
- use external rmic (needed for compatibility with java-gcj-compat)
---- Files affected:
SPECS:
logging-log4j.spec (1.44 -> 1.45)
---- Diffs:
================================================================
Index: SPECS/logging-log4j.spec
diff -u SPECS/logging-log4j.spec:1.44 SPECS/logging-log4j.spec:1.45
--- SPECS/logging-log4j.spec:1.44 Mon Jan 26 20:24:44 2009
+++ SPECS/logging-log4j.spec Tue Feb 3 14:14:42 2009
@@ -1,6 +1,8 @@
# $Revision$, $Date$
# TODO:
# - rename to apache-log4j?
+# - some tests fail, but it seems to be an error in tests, not in log4j
+# - does it really Requires jdk?
#
# NOTE:
# - javamail is provided by java-gnu-mail
@@ -10,6 +12,7 @@
%bcond_without dist # build components which can't be distributed
%bcond_with jms # JMS interface (org.apache.log4j.or.jms)
%bcond_with jmx # JMX interface (org.apache.log4j.jmx)
+%bcond_with tests # tun tests
#
%if %{without dist}
%define with_jms 1
@@ -28,20 +31,22 @@
# Source0-md5: 10f04abe4d68d5a89e8eb167e4e45e1a
URL: http://logging.apache.org/log4j/
Patch0: apache-log4j-javadoc.patch
-BuildRequires: ant
+Patch1: %{name}-sourcetarget.patch
+BuildRequires: ant >= 1.7.1-4
+%{?with_tests:BuildRequires: ant-junit}
BuildRequires: java-activation
+BuildRequires: java-gcj-compat
BuildRequires: javamail >= 1.2
BuildRequires: jaxp_parser_impl
-BuildRequires: jdk >= 1.2
%{?with_jms:BuildRequires: jms >= 1.1}
%{?with_jmx:BuildRequires: jmx-tools >= 1.2.1}
%{?with_jmx:BuildRequires: jmx >= 1.2.1}
%{?with_jmx:BuildRequires: jndi}
BuildRequires: jpackage-utils
-BuildRequires: junit >= 3.8
+%{?with_tests:BuildRequires: junit >= 3.8}
BuildRequires: rpmbuild(macros) >= 1.300
-Requires: jdk >= 1.2
-Suggests: javamail >= 1.2
+Requires: jdk >= 1.3
+Suggests: java-mail >= 1.2
%{?with_jms:Suggests: jms >= 1.1}
%{?with_jmx:Suggests: jmx-tools >= 1.2.1}
Provides: log4j = %{version}
@@ -85,11 +90,19 @@
%prep
%setup -q -n apache-log4j-%{version}
%patch0 -p1
+%patch1 -p1
%build
-required_jars="mailapi activation junit %{?with_jms:jms} %{?with_jmx:jmx
jmxtools}"
+required_jars="mail activation %{?with_jms:jms} %{?with_jmx:jmx jmxtools}"
CLASSPATH=$(build-classpath $required_jars); export CLASSPATH
-%ant jar javadoc
+%ant -Dbuild.compiler=gcj -Dbuild.rmic=forking jar javadoc
+
+%if %{with tests}
+cd tests
+CLASSPATH=$(build-classpath junit)
+export CLASSPATH
+%ant -Dbuild.compiler=gcj build runAll
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -127,6 +140,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45 2009/02/03 13:14:42 pawelz
+- added tests bcond (disabled by default, see TODO)
+- BR: ant >= 1.7.1-4 (1.7 because of rmic=forking, 1.7.1-4 because of
+ source/target attributes used with gcj)
+- added path1 (source/target=1.3; min level supported by gcj)
+- use gcj
+- use external rmic (needed for compatibility with java-gcj-compat)
+
Revision 1.44 2009/01/26 19:24:44 glen
- Libraries/Java
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/logging-log4j.spec?r1=1.44&r2=1.45&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
