SPECS: java-jessie.spec - dropped C: java-sun-jre (it should be handled by ...

pawelz pawelz at pld-linux.org
Wed Apr 8 09:14:55 CEST 2009


Author: pawelz                       Date: Wed Apr  8 07:14:55 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped C: java-sun-jre (it should be handled by O: jsse in java-sun-jre)
- jdk bconds
- rel 2

---- Files affected:
SPECS:
   java-jessie.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/java-jessie.spec
diff -u SPECS/java-jessie.spec:1.1 SPECS/java-jessie.spec:1.2
--- SPECS/java-jessie.spec:1.1	Tue Feb 17 13:21:20 2009
+++ SPECS/java-jessie.spec	Wed Apr  8 09:14:50 2009
@@ -2,7 +2,18 @@
 # TODO:
 # - build provider (see %%build section)
 # - javadoc
-#
+# 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
@@ -10,22 +21,23 @@
 Summary(pl.UTF-8):	Wolna implementacja JSSE
 Name:		java-jessie
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Libraries/Java
 Source0:	http://syzygy.metastatic.org/jessie/jessie-%{version}.tar.gz
 # Source0-md5:	c14db8483ca9fae428b8497659861ef0
 URL:		http://www.nongnu.org/jessie/
 BuildRequires:	ant
-BuildRequires:	java-gcj-compat-devel
+%{!?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:	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
-Conflicts:	java-sun-jre
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,11 +56,11 @@
 
 %build
 %ant clean
-%ant -Dbuild.compiler=extJavac jsse.jar
+%ant jsse.jar
 
 # Does not build
 %if %{with provider}
-%ant -Dbuild.compiler=extJavac compile-provider
+%ant compile-provider
 %endif
 
 %install
@@ -73,6 +85,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+- rel 2
+
 Revision 1.1  2009/02/17 12:21:20  pawelz
 - initial PLD release
 
================================================================

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



More information about the pld-cvs-commit mailing list