Author: pawelz Date: Sun Mar 29 17:39:54 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- jdk bconds
- include java rpm macros
---- Files affected:
SPECS:
scalix.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SPECS/scalix.spec
diff -u SPECS/scalix.spec:1.15 SPECS/scalix.spec:1.16
--- SPECS/scalix.spec:1.15 Sun Mar 29 19:37:23 2009
+++ SPECS/scalix.spec Sun Mar 29 19:39:49 2009
@@ -1,8 +1,14 @@
# $Revision$, $Date$
-#
# TODO:
# - add subpackages for $PACKAGES
# - fix tomcat.home
+%bcond_with java_sun # build with java-sun
+
+%if "%{pld_release}" == "ti"
+%define with_java_sun 1
+%endif
+
+%include /usr/lib/rpm/macros.java
Summary: Scalix Platform
Name: scalix
Version: 11.4.3
@@ -30,8 +36,9 @@
BuildRequires: java-lucene-contrib
BuildRequires: java-mail
BuildRequires: java-servletapi5
-BuildRequires: java-sun
BuildRequires: python-devel >= 2.2.2
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -114,6 +121,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2009/03/29 17:39:49 pawelz
+- jdk bconds
+- include java rpm macros
+
Revision 1.15 2009/03/29 17:37:23 paszczus
- BR: java-lucene-contrib
- sis package now compiles!
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.spec?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
