packages: java-commons-httpclient/java-commons-httpclient.spec - JDK bconds...

[pawelz]

Author: pawelz                       Date: Mon May 18 13:48:34 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- JDK bconds
- drop -Dbuild.classpath hack
- drop SHELL=/bin/sh hack
- make build-classpath errors fatal

---- Files affected:
packages/java-commons-httpclient:
   java-commons-httpclient.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/java-commons-httpclient/java-commons-httpclient.spec
diff -u packages/java-commons-httpclient/java-commons-httpclient.spec:1.14 packages/java-commons-httpclient/java-commons-httpclient.spec:1.15
--- packages/java-commons-httpclient/java-commons-httpclient.spec:1.14	Tue Feb 17 13:16:34 2009
+++ packages/java-commons-httpclient/java-commons-httpclient.spec	Mon May 18 15:48:29 2009
@@ -2,6 +2,12 @@
 # TODO:
 # - do not mark -manual files as %%doc (?)
 %bcond_with	tests	# tests disabled by default sinc it requires java-sun
+%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
 %define		srcname	commons-httpclient
 Summary:	Commons HTTPClient Package
@@ -17,10 +23,12 @@
 BuildRequires:	ant
 BuildRequires:	java-commons-codec
 BuildRequires:	java-commons-logging >= 1.0.3
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jce >= 1.2.2
 BuildRequires:	jpackage-utils
 BuildRequires:	jsse >= 1.0.3.01
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 %if %(locale -a | grep -q '^en_US$'; echo $?)
@@ -110,11 +118,10 @@
 %build
 export LC_ALL=en_US # source code not US-ASCII
 required_jars="glibj jsse jce junit commons-codec commons-logging"
-export CLASSPATH=$(build-classpath $required_jars)
-export SHELL=/bin/sh
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
 
-%ant	-Dbuild.compiler=extJavac \
-	-Djavadoc.j2sdk.link=%{_javadocdir}/java \
+%ant	-Djavadoc.j2sdk.link=%{_javadocdir}/java \
 	-Djavadoc.logging.link=%{_javadocdir}/java-commons-logging \
 	dist %{?with_tests:test}
 
@@ -169,6 +176,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2009/05/18 13:48:29  pawelz
+- JDK bconds
+- drop -Dbuild.classpath hack
+- drop SHELL=/bin/sh hack
+- make build-classpath errors fatal
+
 Revision 1.14  2009/02/17 12:16:34  pawelz
 - build with java-gcj-compat-devel and GNU libraries
 - correct dir for javadoc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-httpclient/java-commons-httpclient.spec?r1=1.14&r2=1.15&f=u