Author: pawelz Date: Sun Apr 18 15:15:30 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
- dropped P: logging-log4j
- updated java deps
---- Files affected:
packages/java-log4j:
java-log4j.spec (1.56 -> 1.57)
---- Diffs:
================================================================
Index: packages/java-log4j/java-log4j.spec
diff -u packages/java-log4j/java-log4j.spec:1.56
packages/java-log4j/java-log4j.spec:1.57
--- packages/java-log4j/java-log4j.spec:1.56 Mon Mar 30 07:37:27 2009
+++ packages/java-log4j/java-log4j.spec Sun Apr 18 17:15:25 2010
@@ -17,10 +17,6 @@
%define with_jmx 1
%endif
-%if "%{pld_release}" == "ti"
-%define with_java_sun 1
-%endif
-#
%define srcname log4j
#
%include /usr/lib/rpm/macros.java
@@ -38,22 +34,20 @@
Patch1: logging-%{srcname}-sourcetarget.patch
BuildRequires: ant >= 1.7.1-4
%{?with_tests:BuildRequires: ant-junit}
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
-BuildRequires: javamail >= 1.2
-BuildRequires: jaxp_parser_impl
+BuildRequires: java(javamail) >= 1.2
+BuildRequires: java(jaxp_parser_impl)
+%{?with_jmx:BuildRequires: java(jmx) >= 1.2.1}
+BuildRequires: java-sun
%{?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}
+%{?with_jmx:BuildRequires: java(jndi)}
BuildRequires: jpackage-utils
%{?with_tests:BuildRequires: junit >= 3.8}
BuildRequires: rpmbuild(macros) >= 1.300
-Suggests: java-mail >= 1.2
+Suggests: java(javamail) >= 1.2
%{?with_jms:Suggests: jms >= 1.1}
%{?with_jmx:Suggests: jmx-tools >= 1.2.1}
Provides: log4j = %{version}
-Provides: logging-log4j = %{version}
Obsoletes: jakarta-log4j
Obsoletes: log4j
BuildArch: noarch
@@ -147,6 +141,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.57 2010/04/18 15:15:25 pawelz
+- don't force specific jdk
+- dropped P: logging-log4j
+- updated java deps
+
Revision 1.56 2009/03/30 05:37:27 pawelz
- G: Libraries/Java
- removed note about java-mail. Java-mail is distributable now.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-log4j/java-log4j.spec?r1=1.56&r2=1.57&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
