SPECS: java-log4j.spec - added bcond java_sun - added conditional bcond for...

[paszczus]

Author: paszczus                     Date: Sat Mar 28 19:36:23 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bcond java_sun
- added conditional bcond for Titanium
- rel 5

---- Files affected:
SPECS:
   java-log4j.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: SPECS/java-log4j.spec
diff -u SPECS/java-log4j.spec:1.48 SPECS/java-log4j.spec:1.49
--- SPECS/java-log4j.spec:1.48	Sat Mar 28 13:46:27 2009
+++ SPECS/java-log4j.spec	Sat Mar 28 20:36:18 2009
@@ -16,6 +16,11 @@
 %define	with_jms	1
 %define	with_jmx	1
 %endif
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
 #
 %define		srcname	log4j
 #
@@ -24,7 +29,7 @@
 Summary(pl.UTF-8):	log4j - zapis logów dla Javy
 Name:		java-%{srcname}
 Version:	1.2.15
-Release:	4
+Release:	5
 License:	Apache v2.0
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/logging/log4j/%{version}/apache-%{srcname}-%{version}.tar.gz
@@ -34,7 +39,8 @@
 Patch1:		logging-%{srcname}-sourcetarget.patch
 BuildRequires:	ant >= 1.7.1-4
 %{?with_tests:BuildRequires:	ant-junit}
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	javamail >= 1.2
 BuildRequires:	jaxp_parser_impl
 %{?with_jms:BuildRequires:	jms >= 1.1}
@@ -139,6 +145,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2009/03/28 19:36:18  paszczus
+- added bcond java_sun
+- added conditional bcond for Titanium
+- rel 5
+
 Revision 1.48  2009/03/28 12:46:27  paszczus
 - removed java-activation BR
 - Obsoletes: log4j due name change
================================================================

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