packages: java-lucene/java-lucene.spec, java-oro/java-oro.spec - Don't forc...

[pawelz]

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

---- Files affected:
packages/java-lucene:
   java-lucene.spec (1.11 -> 1.12) 
packages/java-oro:
   java-oro.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/java-lucene/java-lucene.spec
diff -u packages/java-lucene/java-lucene.spec:1.11 packages/java-lucene/java-lucene.spec:1.12
--- packages/java-lucene/java-lucene.spec:1.11	Mon Mar 30 07:39:47 2009
+++ packages/java-lucene/java-lucene.spec	Fri Apr 23 02:03:25 2010
@@ -12,12 +12,7 @@
 
 %bcond_without  javadoc         # don't build javadoc
 %bcond_with	java_sun	# build with java-sun
-%if "%{pld_release}" == "ti"
-%define	with_java_sun	1
-%endif
-#
 %include	/usr/lib/rpm/macros.java
-#
 %define 	srcname	lucene
 %define		contrib_ver	2.4
 
@@ -33,8 +28,7 @@
 URL:		http://lucene.apache.org/
 BuildRequires:	ant
 BuildRequires:	java-commons-digester
-%{!?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
@@ -194,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/04/23 00:03:25  pawelz
+- Don't force specific jdk.
+
 Revision 1.11  2009/03/30 05:39:47  pawelz
 - G: Libraries/Java
 - unified apache download link

================================================================
Index: packages/java-oro/java-oro.spec
diff -u packages/java-oro/java-oro.spec:1.16 packages/java-oro/java-oro.spec:1.17
--- packages/java-oro/java-oro.spec:1.16	Wed Apr  1 18:37:28 2009
+++ packages/java-oro/java-oro.spec	Fri Apr 23 02:03:29 2010
@@ -1,12 +1,6 @@
 # $Revision$, $Date$
 %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         oro
@@ -22,10 +16,8 @@
 Patch0:		jakarta-oro-buildfix.patch
 URL:		http://jakarta.apache.org/oro/
 BuildRequires:	ant >= 1.5
-%{!?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:	rpmbuild(macros) >= 1.300
 Provides:	jakarta-oro
 Obsoletes:	jakarta-oro
@@ -113,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/04/23 00:03:29  pawelz
+- Don't force specific jdk.
+
 Revision 1.16  2009/04/01 16:37:28  pawelz
 - O/P old name
 - rel 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-lucene/java-lucene.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-oro/java-oro.spec?r1=1.16&r2=1.17&f=u