Author: paszczus Date: Tue Mar 31 20:49:29 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - proper bcond for java_sun and BR for it
---- Files affected: SPECS: scalix.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SPECS/scalix.spec diff -u SPECS/scalix.spec:1.23 SPECS/scalix.spec:1.24 --- SPECS/scalix.spec:1.23 Tue Mar 31 21:19:42 2009 +++ SPECS/scalix.spec Tue Mar 31 22:49:24 2009 @@ -4,12 +4,13 @@ # - package spring framework: http://springsource.org # - after packaging spring, use it instead of interla spring.jar from scalix # - descriptions/summaries -%bcond_with java_sun # build with java-sun - +# Conditional build: %if "%{pld_release}" == "ti" -%define with_java_sun 1 +%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 Platform Name: scalix @@ -44,15 +45,16 @@ BuildRequires: java-commons-logging %{!?with_java_sun:BuildRequires: java-gcj-compat-devel} BuildRequires: java-ical4j +BuildRequires: java-jdom BuildRequires: java-log4j BuildRequires: java-lucene-contrib BuildRequires: java-mail -BuildRequires: java-jdom BuildRequires: java-saaj BuildRequires: java-servletapi5 %{?with_java_sun:BuildRequires: java-sun} BuildRequires: java-xerces BuildRequires: python-devel >= 2.2.2 +BuildRequires: rpm >= 4.4.9-56 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -181,6 +183,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2009/03/31 20:49:24 paszczus +- proper bcond for java_sun and BR for it + Revision 1.23 2009/03/31 19:19:42 paszczus - save work, platform almost ready ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.spec?r1=1.23&r2=1.24&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
