packages: java-stax/java-stax.spec - use gcj, not ecj when being built with...

[pawelz]

Author: pawelz                       Date: Wed Jan 20 12:36:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use gcj, not ecj when being built without java_sun. No idea why it fails with ecj.
- don't build javadoc if without_javadoc

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

---- Diffs:

================================================================
Index: packages/java-stax/java-stax.spec
diff -u packages/java-stax/java-stax.spec:1.2 packages/java-stax/java-stax.spec:1.3
--- packages/java-stax/java-stax.spec:1.2	Wed Jan 20 13:08:55 2010
+++ packages/java-stax/java-stax.spec	Wed Jan 20 13:36:39 2010
@@ -75,8 +75,14 @@
 export LC_ALL=en_US
 
 %ant clean
+%if %{without java_sun}
+%ant -Dbuild.compiler=gcj dist
+%else
 %ant dist
+%endif
+%if %{with javadoc}
 %ant javadoc
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,9 +93,11 @@
 cp -a build/%{srcname}-api-%{apiversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-api-%{apiversion}.jar
 ln -s %{srcname}-api-%{apiversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-api.jar
 
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a src/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -108,10 +116,12 @@
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -119,6 +129,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/01/20 12:36:39  pawelz
+- use gcj, not ecj when being built without java_sun. No idea why it fails with ecj.
+- don't build javadoc if without_javadoc
+
 Revision 1.2  2010/01/20 12:08:55  pawelz
 - unify java spec (BRs, drop ugly hacks, that are no longer needed)
 
================================================================

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