packages: java-stax/java-stax.spec - unify java spec (BRs, drop ugly hacks, ...

[pawelz]

Author: pawelz                       Date: Wed Jan 20 12:09:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify java spec (BRs, drop ugly hacks, that are no longer needed)

---- Files affected:
packages/java-stax:
   java-stax.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-stax/java-stax.spec
diff -u packages/java-stax/java-stax.spec:1.1 packages/java-stax/java-stax.spec:1.2
--- packages/java-stax/java-stax.spec:1.1	Fri Feb  6 16:58:13 2009
+++ packages/java-stax/java-stax.spec	Wed Jan 20 13:08:55 2010
@@ -4,6 +4,11 @@
 %bcond_without	javadoc		# don't build javadoc
 %bcond_without	tests		# don't build and run tests
 #
+%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		apiversion	1.0.1
@@ -19,11 +24,13 @@
 Patch0:		%{name}-sourcetarget.patch
 URL:		http://stax.codehaus.org/
 BuildRequires:	ant >= 1.7.1-4
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Provides:	stax-api = %{api_version}
+Provides:	java(Stax) = %{apiversion}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -64,10 +71,11 @@
 %patch0 -p1
 
 %build
-export SHELL=/bin/sh
+
+export LC_ALL=en_US
 
 %ant clean
-%ant -Dbuild.compiler=gcj dist
+%ant dist
 %ant javadoc
 
 %install
@@ -111,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/01/20 12:08:55  pawelz
+- unify java spec (BRs, drop ugly hacks, that are no longer needed)
+
 Revision 1.1  2009/02/06 15:58:13  pawelz
 - initial PLD release
 
================================================================

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