SPECS: java-commons-net.spec - fix build without java_sun.

[pawelz]

Author: pawelz                       Date: Tue Mar 24 08:18:05 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix build without java_sun.

---- Files affected:
SPECS:
   java-commons-net.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/java-commons-net.spec
diff -u SPECS/java-commons-net.spec:1.20 SPECS/java-commons-net.spec:1.21
--- SPECS/java-commons-net.spec:1.20	Sun Mar 22 01:36:55 2009
+++ SPECS/java-commons-net.spec	Tue Mar 24 09:17:59 2009
@@ -20,13 +20,16 @@
 URL:		http://commons.apache.org/net/
 BuildRequires:	ant >= 1.5
 BuildRequires:	jakarta-oro >= 2.0.8
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{!?with_java_sun:BuildRequires:	java-gnu-classpath}
+%{?with_java:BuildRequires:	java-sun}
 #BuildRequires:	jaxp
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jakarta-oro >= 2.0.8
 Provides:	jakarta-commons-net
 Obsoletes:	jakarta-commons-net
-Requires:	jakarta-oro >= 2.0.8
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,22 +58,32 @@
 %setup -q -n commons-net-%{version}-src
 
 %build
-cp LICENSE.txt LICENSE
-export CLASSPATH="`build-classpath oro junit`"
+
+# java.util.regexp from libgcj-4.3 does not provide Mather.toMatchResult()
+# method, so we have to use one provided by glibj (from gnu-classpath).
+# toMatchResult is implemented in libgcj-4.4, so most probably, when gcc-4.4
+# will be released, we can can drop gnu-classpath dependency
+%if %{without java_sun}
+  glibj_jar=$(find-jar glibj)
+%endif
+
+CLASSPATH=$CLASSPATH:$(build-classpath oro junit)
+export CLASSPATH
 export JAVA_HOME="%{java_home}"
 
 mkdir build
 
 %javac \
-    -classpath $CLASSPATH \
-    -d build \
-    -source 1.5 \
-    -target 1.5 \
-    $(find src/main/java/org -name '*.java')
+	-classpath $CLASSPATH \
+	-d build \
+	-source 1.5 \
+	-target 1.5 \
+	%{!?with_java_sun:-bootclasspath "$glibj_jar"} \
+	$(find src/main/java/org -name '*.java')
 
 %if %{with javadoc}
 %javadoc -d apidocs \
-	org.apache.commons.neti \
+	%{?with_java_sun:org.apache.commons.net} \
 	$(find src/main/java/org -name '*.java')
 %endif
 
@@ -109,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2009/03/24 08:17:59  pawelz
+- fix build without java_sun.
+
 Revision 1.20  2009/03/22 00:36:55  pawelz
 - added TODO (does not build with java-gcj-compat-devel)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-net.spec?r1=1.20&r2=1.21&f=u