SPECS: java-jaxen.spec - restore bcond setup which would allow building wit...

[glen]

Author: glen                         Date: Mon Mar 30 00:52:04 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- restore bcond setup which would allow building with/without java_sun
- oh and BR for %{pld_release} comparision

---- Files affected:
SPECS:
   java-jaxen.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/java-jaxen.spec
diff -u SPECS/java-jaxen.spec:1.5 SPECS/java-jaxen.spec:1.6
--- SPECS/java-jaxen.spec:1.5	Sun Mar 29 17:31:34 2009
+++ SPECS/java-jaxen.spec	Mon Mar 30 02:51:59 2009
@@ -5,15 +5,13 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 %bcond_without	tests		# don't build and run tests
-%bcond_with	java_sun	# build with java-sun
-#
 %if "%{pld_release}" == "ti"
-%define	with_java_sun	1
-%endif
-#
-%include	/usr/lib/rpm/macros.java
-#
+%bcond_without java_sun        # build with gcj
+%else
+%bcond_with    java_sun        # build with java-sun
+
 %define		srcname		jaxen
+%include	/usr/lib/rpm/macros.java
 Summary:	Jaxen
 Name:		java-jaxen
 Version:	1.1.1
@@ -23,10 +21,11 @@
 Source0:	http://dist.codehaus.org/jaxen/distributions/jaxen-%{version}-src.tar.gz
 # Source0-md5:	b598ae6b7e765a92e13667b0a80392f4
 URL:		http://jaxen.codehaus.org/
+BuildRequires:	java-dom4j
 %{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
 %{?with_java_sun:BuildRequires:	java-sun}
-BuildRequires:	java-dom4j
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildArch:	noarch
@@ -123,6 +122,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/03/30 00:51:59  glen
+- restore bcond setup which would allow building with/without java_sun
+- oh and BR for %{pld_release} comparision
+
 Revision 1.5  2009/03/29 15:31:34  paszczus
 - proper bcond for Titanium
 - proper Group
================================================================

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