packages: jflex/jflex.spec, mockobjects/mockobjects.spec - Don't force spec...

[pawelz]

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

---- Files affected:
packages/jflex:
   jflex.spec (1.13 -> 1.14) 
packages/mockobjects:
   mockobjects.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/jflex/jflex.spec
diff -u packages/jflex/jflex.spec:1.13 packages/jflex/jflex.spec:1.14
--- packages/jflex/jflex.spec:1.13	Tue Apr 21 16:43:04 2009
+++ packages/jflex/jflex.spec	Fri Apr 23 02:03:57 2010
@@ -3,12 +3,6 @@
 # - compile Source1 in spec (sources in src/)
 #
 # Conditional build:
-%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
 Summary:	Fast Scanner Generator
 Summary(pl.UTF-8):	Szybki generator skanerów leksykalnych
@@ -26,8 +20,7 @@
 URL:		http://jflex.de/
 BuildRequires:	ant >= 1.4
 BuildRequires:	java-cup >= 0.11a
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.8.1
 BuildRequires:	rpm-javaprov
@@ -119,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/04/23 00:03:57  pawelz
+- Don't force specific jdk.
+
 Revision 1.13  2009/04/21 14:43:04  glen
 - update to 1.4.3, builds with java-cup 0.11a
 

================================================================
Index: packages/mockobjects/mockobjects.spec
diff -u packages/mockobjects/mockobjects.spec:1.6 packages/mockobjects/mockobjects.spec:1.7
--- packages/mockobjects/mockobjects.spec:1.6	Tue May 19 02:49:13 2009
+++ packages/mockobjects/mockobjects.spec	Fri Apr 23 02:04:01 2010
@@ -17,7 +17,7 @@
 BuildRequires:	ant
 BuildRequires:	ant >= 1.6.1
 BuildRequires:	java-commons-httpclient
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	jdk < 1.5
 BuildRequires:	jdk >= 1.4.0
 BuildRequires:	junit
@@ -296,6 +296,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/04/23 00:04:01  pawelz
+- Don't force specific jdk.
+
 Revision 1.6  2009/05/19 00:49:13  glen
 - update deps, source is nowhere to be found
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jflex/jflex.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mockobjects/mockobjects.spec?r1=1.6&r2=1.7&f=u