Author: pawelz Date: Sun Apr 18 15:20:38 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
- updated java deps
- unified sf download url
---- Files affected:
packages/java-mx4j:
java-mx4j.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: packages/java-mx4j/java-mx4j.spec
diff -u packages/java-mx4j/java-mx4j.spec:1.22
packages/java-mx4j/java-mx4j.spec:1.23
--- packages/java-mx4j/java-mx4j.spec:1.22 Wed Apr 1 17:51:33 2009
+++ packages/java-mx4j/java-mx4j.spec Sun Apr 18 17:20:33 2010
@@ -2,11 +2,6 @@
#
# Conditional build:
%bcond_with doc # build docs (broken)
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
%include /usr/lib/rpm/macros.java
@@ -19,33 +14,32 @@
Epoch: 0
License: Apache
Group: Development/Languages/Java
-Source0: http://dl.sourceforge.net/mx4j/%{srcname}-%{version}-src.tar.gz
+Source0:
http://downloads.sourceforge.net/mx4j/%{srcname}-%{version}-src.tar.gz
# Source0-md5: 1c01f620c21efb0a84c3105c064b9047
Patch0: %{name}-sourcetarget.patch
URL: http://mx4j.sourceforge.net/
BuildRequires: ant >= 1.7
BuildRequires: ant-trax
-BuildRequires: axis
-BuildRequires: jaf
BuildRequires: jakarta-bcel >= 5.0
+BuildRequires: java(jaf)
+BuildRequires: java(javamail) >= 1.2
+BuildRequires: java(jce) >= 1.2.2
+BuildRequires: java(jsse) >= 1.0.2
+BuildRequires: java(servlet)
+BuildRequires: java-axis
BuildRequires: java-commons-logging >= 1.0.1
BuildRequires: java-gcj-compat-devel
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
%{!?with_java_sun:BuildRequires: java-gnu-classpath}
BuildRequires: java-hessian
BuildRequires: java-junit >= 3.8
BuildRequires: java-log4j >= 1.2.7
-%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: java-xml-commons
-BuildRequires: javamail >= 1.2
BuildRequires: jaxp_transform_impl
-BuildRequires: jce >= 1.2.2
+BuildRequires: jdk
BuildRequires: jpackage-utils
-BuildRequires: jsse >= 1.0.2
BuildRequires: jython >= 2.1
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: servlet
Provides: jmxri
Obsoletes: openjmx
BuildArch: noarch
@@ -168,6 +162,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2010/04/18 15:20:33 pawelz
+- don't force specific jdk
+- updated java deps
+- unified sf download url
+
Revision 1.22 2009/04/01 15:51:33 pawelz
- BR and CLASSPATH fixes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-mx4j/java-mx4j.spec?r1=1.22&r2=1.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
