packages: java-commons-el/java-commons-el.spec - JDK bconds - removed SHELL...

[pawelz]

Author: pawelz                       Date: Mon May 18 11:25:28 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- JDK bconds
- removed SHELL=/bin/sh hack

---- Files affected:
packages/java-commons-el:
   java-commons-el.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/java-commons-el/java-commons-el.spec
diff -u packages/java-commons-el/java-commons-el.spec:1.13 packages/java-commons-el/java-commons-el.spec:1.14
--- packages/java-commons-el/java-commons-el.spec:1.13	Tue Feb 17 09:44:09 2009
+++ packages/java-commons-el/java-commons-el.spec	Mon May 18 13:25:23 2009
@@ -2,6 +2,11 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
+%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,10 +24,12 @@
 Patch1:		commons-el-ant.patch
 URL:		http://commons.apache.org/commons/el/
 BuildRequires:	ant
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	jsp
 BuildRequires:	junit
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servlet
@@ -75,15 +82,8 @@
 %ant	-Dcompile.source=1.4 \
 	-Dfinal.name=commons-el \
 	-Dj2se.javadoc=%{_javadocdir}/java \
-	jar
-
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant	-Dcompile.source=1.4 \
-	-Dfinal.name=commons-el \
-	-Dj2se.javadoc=%{_javadocdir}/java \
-	javadoc
-%endif
+	jar \
+	%{?with_javadoc:javadoc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -124,6 +124,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2009/05/18 11:25:23  pawelz
+- JDK bconds
+- removed SHELL=/bin/sh hack
+
 Revision 1.13  2009/02/17 08:44:09  pawelz
 - typo in %%post javadoc
 
================================================================

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