packages: java-commons-httpclient/java-commons-httpclient.spec, java-common...

[pawelz]

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

---- Files affected:
packages/java-commons-httpclient:
   java-commons-httpclient.spec (1.15 -> 1.16) 
packages/java-commons-io:
   java-commons-io.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/java-commons-httpclient/java-commons-httpclient.spec
diff -u packages/java-commons-httpclient/java-commons-httpclient.spec:1.15 packages/java-commons-httpclient/java-commons-httpclient.spec:1.16
--- packages/java-commons-httpclient/java-commons-httpclient.spec:1.15	Mon May 18 15:48:29 2009
+++ packages/java-commons-httpclient/java-commons-httpclient.spec	Fri Apr 23 02:02:21 2010
@@ -2,12 +2,6 @@
 # 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
@@ -23,12 +17,10 @@
 BuildRequires:	ant
 BuildRequires:	java-commons-codec
 BuildRequires:	java-commons-logging >= 1.0.3
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 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 $?)
@@ -176,6 +168,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/04/23 00:02:21  pawelz
+- Don't force specific jdk.
+
 Revision 1.15  2009/05/18 13:48:29  pawelz
 - JDK bconds
 - drop -Dbuild.classpath hack

================================================================
Index: packages/java-commons-io/java-commons-io.spec
diff -u packages/java-commons-io/java-commons-io.spec:1.16 packages/java-commons-io/java-commons-io.spec:1.17
--- packages/java-commons-io/java-commons-io.spec:1.16	Mon May 18 15:50:42 2009
+++ packages/java-commons-io/java-commons-io.spec	Fri Apr 23 02:02:25 2010
@@ -4,12 +4,6 @@
 %bcond_without	javadoc		# don't build javadoc
 %bcond_with	tests		# run tests (takes long time)
 
-%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-io
@@ -25,11 +19,9 @@
 URL:		http://commons.apache.org/io/
 BuildRequires:	ant
 %{?with_tests:BuildRequires:	ant-junit >= 1.5}
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 %{?with_tests:BuildRequires:	junit >= 3.8.1}
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
@@ -112,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/04/23 00:02:25  pawelz
+- Don't force specific jdk.
+
 Revision 1.16  2009/05/18 13:50:42  pawelz
 - JDK bconds for Titanium
 - versioned rpm BR
================================================================

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