packages: java-jessie/java-jessie.spec - don't force specific jdk - updated...

pawelz pawelz at pld-linux.org
Sun Apr 18 17:03:26 CEST 2010


Author: pawelz                       Date: Sun Apr 18 15:03:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- updated Provides
- TODO (C: java-sun?)

---- Files affected:
packages/java-jessie:
   java-jessie.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/java-jessie/java-jessie.spec
diff -u packages/java-jessie/java-jessie.spec:1.2 packages/java-jessie/java-jessie.spec:1.3
--- packages/java-jessie/java-jessie.spec:1.2	Wed Apr  8 09:14:50 2009
+++ packages/java-jessie/java-jessie.spec	Sun Apr 18 17:03:18 2010
@@ -2,18 +2,12 @@
 # TODO:
 # - build provider (see %%build section)
 # - javadoc
+# - consider C: java-sun, see NOTE
 # NOTE:
 # - it is possible to build it using java-sun, but sun's JRE provides better
 #   implementation of JSSE. This package is a JSSE replacemnt for alternative
 #   JREs, like java-gcj-compat.
 
-# 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
 #
 %define		srcname	jessie
@@ -28,16 +22,14 @@
 # Source0-md5:	c14db8483ca9fae428b8497659861ef0
 URL:		http://www.nongnu.org/jessie/
 BuildRequires:	ant
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	java-gnu-classpath
 BuildRequires:	java-gnu-crypto >= 2.0.1
+BuildRequires:	java-sun
 BuildRequires:	jpackage-utils >= 0:1.6
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
-Provides:	jsse = 1.4
+Provides:	java(jsse) = 1.4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,6 +77,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/04/18 15:03:18  pawelz
+- don't force specific jdk
+- updated Provides
+- TODO (C: java-sun?)
+
 Revision 1.2  2009/04/08 07:14:50  pawelz
 - dropped C: java-sun-jre (it should be handled by O: jsse in java-sun-jre)
 - jdk bconds
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jessie/java-jessie.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list