packages: java-classpathx_servlet/java-classpathx_servlet.spec, java-common...

[pawelz]

Author: pawelz                       Date: Fri Apr 23 00:02:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Don't force specific jdk.

---- Files affected:
packages/java-classpathx_servlet:
   java-classpathx_servlet.spec (1.12 -> 1.13) 
packages/java-commons-beanutils:
   java-commons-beanutils.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/java-classpathx_servlet/java-classpathx_servlet.spec
diff -u packages/java-classpathx_servlet/java-classpathx_servlet.spec:1.12 packages/java-classpathx_servlet/java-classpathx_servlet.spec:1.13
--- packages/java-classpathx_servlet/java-classpathx_servlet.spec:1.12	Sat Apr 11 15:51:42 2009
+++ packages/java-classpathx_servlet/java-classpathx_servlet.spec	Fri Apr 23 02:01:57 2010
@@ -3,12 +3,6 @@
 # - javadoc generation fails with gjdoc
 
 %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
 
 %define		srcname		classpathx_servlet
@@ -23,10 +17,8 @@
 # Source0-md5:	a81feddb91b1358f9aaed94e83eddb54
 Patch0:		%{name}-gjdoc.patch
 URL:		http://www.euronet.nl/~pauls/java/servlet/
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Provides:	classpathx_servlet
@@ -122,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/04/23 00:01:57  pawelz
+- Don't force specific jdk.
+
 Revision 1.12  2009/04/11 13:51:42  pawelz
 - added gjdoc path (now it builds with both jdks)
 - rel 6

================================================================
Index: packages/java-commons-beanutils/java-commons-beanutils.spec
diff -u packages/java-commons-beanutils/java-commons-beanutils.spec:1.24 packages/java-commons-beanutils/java-commons-beanutils.spec:1.25
--- packages/java-commons-beanutils/java-commons-beanutils.spec:1.24	Mon May 18 11:32:44 2009
+++ packages/java-commons-beanutils/java-commons-beanutils.spec	Fri Apr 23 02:02:01 2010
@@ -2,12 +2,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	# build with java-sun
-%endif
-#
 %include	/usr/lib/rpm/macros.java
 #
 %define		srcname	commons-beanutils
@@ -24,11 +18,9 @@
 URL:		http://commons.apache.org/beanutils/
 BuildRequires:	java-commons-collections
 BuildRequires:	java-commons-logging
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Suggests:	java-commons-collections
@@ -117,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/04/23 00:02:01  pawelz
+- Don't force specific jdk.
+
 Revision 1.24  2009/05/18 09:32:44  pawelz
 - do not BR: java-gcj-compat-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-classpathx_servlet/java-classpathx_servlet.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-beanutils/java-commons-beanutils.spec?r1=1.24&r2=1.25&f=u