packages: java-servletapi5/java-servletapi5.spec - do not force gcj/java_sun

[jajcus]

Author: jajcus                       Date: Sat Apr 17 20:01:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not force gcj/java_sun

---- Files affected:
packages/java-servletapi5:
   java-servletapi5.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/java-servletapi5/java-servletapi5.spec
diff -u packages/java-servletapi5/java-servletapi5.spec:1.29 packages/java-servletapi5/java-servletapi5.spec:1.30
--- packages/java-servletapi5/java-servletapi5.spec:1.29	Sun Sep 20 20:59:37 2009
+++ packages/java-servletapi5/java-servletapi5.spec	Sat Apr 17 22:01:47 2010
@@ -4,11 +4,6 @@
 #
 # 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	# use java-sun
-%endif
 
 %define		jspapiver	2.0
 %define		servletapiver	2.4
@@ -28,11 +23,9 @@
 Patch0:		jakarta-servletapi5-target.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
 Provides:	java(JSP) = %{jspapiver}
 Provides:	java(Servlet) = %{servletapiver}
@@ -129,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2010/04/17 20:01:47  jajcus
+- do not force gcj/java_sun
+
 Revision 1.29  2009/09/20 18:59:37  pawelz
 - fixed symlinks
 - rel 3 (for Titanium only. There is no need to rebuild it for Th or Ac)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-servletapi5/java-servletapi5.spec?r1=1.29&r2=1.30&f=u