packages: ant-cpptasks/ant-cpptasks.spec, db4.7/db4.7.spec - Don't force sp...

[pawelz]

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

---- Files affected:
packages/ant-cpptasks:
   ant-cpptasks.spec (1.3 -> 1.4) 
packages/db4.7:
   db4.7.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/ant-cpptasks/ant-cpptasks.spec
diff -u packages/ant-cpptasks/ant-cpptasks.spec:1.3 packages/ant-cpptasks/ant-cpptasks.spec:1.4
--- packages/ant-cpptasks/ant-cpptasks.spec:1.3	Tue Oct 13 13:54:29 2009
+++ packages/ant-cpptasks/ant-cpptasks.spec	Fri Apr 23 02:01:41 2010
@@ -1,11 +1,5 @@
 # $Revision$, $Date$
 
-%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		_rc	b5
@@ -20,11 +14,9 @@
 # Source0-md5:	7f0f7732acd0c82f7efb228f667ec79a
 URL:		http://sf.net/projects/ant-contrib
 BuildRequires:	ant
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	java-xerces
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 # for %{_javadir}
@@ -69,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/04/23 00:01:41  pawelz
+- Don't force specific jdk.
+
 Revision 1.3  2009/10/13 11:54:29  pawelz
 - adapterized
 - removed changelog entries from template

================================================================
Index: packages/db4.7/db4.7.spec
diff -u packages/db4.7/db4.7.spec:1.23 packages/db4.7/db4.7.spec:1.24
--- packages/db4.7/db4.7.spec:1.23	Wed Aug 19 08:50:52 2009
+++ packages/db4.7/db4.7.spec	Fri Apr 23 02:01:45 2010
@@ -5,12 +5,6 @@
 %bcond_without	tcl		# don't build Tcl bindings
 %bcond_without	static_libs	# don't build static libraries
 
-%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		libver		4.7
@@ -31,9 +25,7 @@
 BuildRequires:	automake
 BuildRequires:	ed
 %if %{with java}
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
-BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	jdk
 BuildRequires:	rpm-javaprov
 %endif
 BuildRequires:	libstdc++-devel
@@ -510,6 +502,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2010/04/23 00:01:45  pawelz
+- Don't force specific jdk.
+
 Revision 1.23  2009/08/19 06:50:52  arekm
 - rel 6; docdir also belongs to utils package so it doesn't require -devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ant-cpptasks/ant-cpptasks.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.7/db4.7.spec?r1=1.23&r2=1.24&f=u