Author: qboosh Date: Sun Dec 16 02:12:46 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - added bconds for JMS and JMX interfaces
---- Files affected: SPECS: logging-log4j.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/logging-log4j.spec diff -u SPECS/logging-log4j.spec:1.38 SPECS/logging-log4j.spec:1.39 --- SPECS/logging-log4j.spec:1.38 Sat Dec 8 14:59:48 2007 +++ SPECS/logging-log4j.spec Sun Dec 16 03:12:40 2007 @@ -1,14 +1,15 @@ # $Revision$, $Date$ # TODO: # - rename to apache-log4j? -# - do something with jms / jmx requirements; -# http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2006-May/017648.html -# - jndi (whatever it is) is required for jmx interface # # NOTE: # - javamail is provided by java-gnu-mail # - jmx,jndi by java-sun-jre - +# +# Conditional build: +%bcond_without jms # JMS interface (org.apache.log4j.or.jms) +%bcond_without jmx # JMX interface (org.apache.log4j.jmx) +# %include /usr/lib/rpm/macros.java Summary: log4j - logging for Java Summary(pl.UTF-8): log4j - zapis logów dla Javy @@ -23,14 +24,18 @@ BuildRequires: ant BuildRequires: java-activation BuildRequires: javamail >= 1.2 +BuildRequires: jaxp_parser_impl BuildRequires: jdk >= 1.2 -#BuildRequires: jms -#BuildRequires: jmx +%{?with_jms:BuildRequires: jms >= 1.1} +%{?with_jmx:BuildRequires: jmx >= 1.2.1} +%{?with_jmx:BuildRequires: jmx-tools >= 1.2.1} +%{?with_jmx:BuildRequires: jndi} BuildRequires: jpackage-utils BuildRequires: junit >= 3.8 BuildRequires: rpmbuild(macros) >= 1.300 Requires: jdk >= 1.2 -#Requires: jms +%{?with_jms:Suggests: jms >= 1.1} +%{?with_jmx:Suggests: jmx-tools >= 1.2.1} Suggests: javamail >= 1.2 Provides: log4j = %{version} Obsoletes: jakarta-log4j @@ -74,7 +79,7 @@ %setup -q -n apache-log4j-%{version} %build -required_jars="mailapi activation junit" +required_jars="mailapi activation junit%{?with_jms: jms}%{?with_jmx: jmx jmxtools}" export CLASSPATH=$(build-classpath $required_jars) %ant jar javadoc @@ -95,8 +100,9 @@ %files %defattr(644,root,root,755) -%doc LICENSE -%{_javadir}/*.jar +%doc LICENSE NOTICE +%{_javadir}/log4j-%{version}.jar +%{_javadir}/log4j.jar %files doc %defattr(644,root,root,755) @@ -113,6 +119,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2007-12-16 02:12:40 qboosh +- added bconds for JMS and JMX interfaces + Revision 1.38 2007-12-08 13:59:48 glen - fixup javadoc %post - drop EA and try coope this time ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/logging-log4j.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
