packages: saxon/saxon.spec, scalix/scalix.spec - Don't force specific jdk.

[pawelz]

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

---- Files affected:
packages/saxon:
   saxon.spec (1.26 -> 1.27) 
packages/scalix:
   scalix.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/saxon/saxon.spec
diff -u packages/saxon/saxon.spec:1.26 packages/saxon/saxon.spec:1.27
--- packages/saxon/saxon.spec:1.26	Wed Apr 15 14:06:37 2009
+++ packages/saxon/saxon.spec	Fri Apr 23 02:04:21 2010
@@ -1,12 +1,6 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_with	java_sun	# build with java-sun
-%endif
-#
 %define		ver		6.5.5
 %define		_ver		6-5-5
 #
@@ -27,7 +21,7 @@
 URL:		http://saxon.sourceforge.net/
 %if %{with java_sun}
 BuildRequires:	ant
-BuildRequires:	java-sun
+BuildRequires:	jdk
 %else
 BuildRequires:	ant >= 1.7.1-3
 BuildRequires:	java-gcj-compat-devel
@@ -99,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/04/23 00:04:21  pawelz
+- Don't force specific jdk.
+
 Revision 1.26  2009/04/15 12:06:37  megabajt
 - build jars using ant
 - added -javadoc subpackage

================================================================
Index: packages/scalix/scalix.spec
diff -u packages/scalix/scalix.spec:1.36 packages/scalix/scalix.spec:1.37
--- packages/scalix/scalix.spec:1.36	Sun Apr 12 17:31:51 2009
+++ packages/scalix/scalix.spec	Fri Apr 23 02:04:25 2010
@@ -6,12 +6,6 @@
 # - descriptions/summaries
 #
 # 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:	Scalix Collaboration Platform
 Name:		scalix
@@ -44,7 +38,6 @@
 BuildRequires:	java-commons-httpclient
 BuildRequires:	java-commons-lang
 BuildRequires:	java-commons-logging
-%{!?with_java_sun:BuildRequires:        java-gcj-compat-devel}
 BuildRequires:	java-ical4j
 BuildRequires:	java-jdom
 BuildRequires:	java-log4j
@@ -52,10 +45,9 @@
 BuildRequires:	java-mail
 BuildRequires:	java-saaj
 BuildRequires:	java-servletapi5
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires:	jdk
 BuildRequires:	java-xerces
 BuildRequires:	python-devel >= 2.2.2
-BuildRequires:	rpm >= 4.4.9-56
 Requires:	group(servlet)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -215,6 +207,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2010/04/23 00:04:25  pawelz
+- Don't force specific jdk.
+
 Revision 1.36  2009/04/12 15:31:51  pawelz
 - R: group(servlet)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/saxon/saxon.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scalix/scalix.spec?r1=1.36&r2=1.37&f=u