summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpawelz2009-04-01 15:51:33 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit43001751513259fbfb739bfd2808932e1d168777 (patch)
treec6b5b050d96b05a8134d9a5e4753a2a453df8b99
parentcb36b245caadb5a7cecc0ef402ff25cb54fb0b83 (diff)
downloadjava-mx4j-43001751513259fbfb739bfd2808932e1d168777.zip
java-mx4j-43001751513259fbfb739bfd2808932e1d168777.tar.gz
- BR and CLASSPATH fixes
Changed files: java-mx4j.spec -> 1.22
-rw-r--r--java-mx4j.spec30
1 files changed, 15 insertions, 15 deletions
diff --git a/java-mx4j.spec b/java-mx4j.spec
index a8302fd..70c02e2 100644
--- a/java-mx4j.spec
+++ b/java-mx4j.spec
@@ -20,29 +20,31 @@ License: Apache
Group: Development/Languages/Java
Source0: http://dl.sourceforge.net/mx4j/%{srcname}-%{version}-src.tar.gz
# Source0-md5: 1c01f620c21efb0a84c3105c064b9047
-Patch0: java-mx4j-sourcetarget.patch
+Patch0: %{name}-sourcetarget.patch
URL: http://mx4j.sourceforge.net/
BuildRequires: ant >= 1.7
BuildRequires: ant-trax
-# BuildRequires: axis
+BuildRequires: axis
BuildRequires: jaf
BuildRequires: jakarta-bcel >= 5.0
-BuildRequires: jakarta-commons-logging >= 1.0.1
-BuildRequires: javamail >= 1.2
+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}
-%{?with_java_sun:BuildRequires: java-sun}
+%{!?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: jpackage-utils
BuildRequires: jsse >= 1.0.2
-BuildRequires: rpm-javaprov
-BuildRequires: junit >= 3.8
BuildRequires: jython >= 2.1
-BuildRequires: logging-log4j >= 1.2.7
+BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: xml-commons
+BuildRequires: servlet
Provides: jmxri
Obsoletes: openjmx
BuildArch: noarch
@@ -88,7 +90,7 @@ Javadoc documentation for %{name}.
Dokumentacja javadoc do %{name}.
%prep
-%setup -q
+%setup -q -n %{srcname}-%{version}
%build
required_jars="\
@@ -104,14 +106,12 @@ jce \
log4j \
junit \
jaxp_transform_impl \
-tools \
-ecj \
-libgcj \
servlet \
hessian \
-glibj
"
+%{!?with_java_sun:requires_jars=$required_jars glibj}
+
CLASSPATH=$(build-classpath $required_jars)
export CLASSPATH